[midPoint-git] [Evolveum/midpoint] d48b58: Fix midpoint.hasArchetype method
mederly
noreply at github.com
Tue Mar 8 17:23:21 CET 2022
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: d48b58186876ff287ed46bcbe5846e405ec2134b
https://github.com/Evolveum/midpoint/commit/d48b58186876ff287ed46bcbe5846e405ec2134b
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-03-08 (Tue, 08 Mar 2022)
Changed paths:
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/ArchetypeManager.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/TestArchetypes.java
A model/model-intest/src/test/resources/archetypes/archetype-student.xml
A model/model-intest/src/test/resources/archetypes/resource-dummy-lab.xml
A model/model-intest/src/test/resources/archetypes/resource-dummy-source.xml
M model/model-intest/src/test/resources/archetypes/role-business-bosun.xml
M model/model-intest/src/test/resources/archetypes/role-business-captain.xml
M model/model-intest/src/test/resources/archetypes/role-employee-base.xml
A model/model-intest/src/test/resources/archetypes/role-lab-access.xml
M model/model-intest/src/test/resources/archetypes/user-template-archetypes-global.xml
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
Log Message:
-----------
Fix midpoint.hasArchetype method
The MidpointFunctions#hasArchetype method looked only at effectively
present archetypes (archetypeRef). This was not consistent with other
archetype-related methods like getArchetypes or getArchetypeOids that
used assignments as well.
So - preliminarily! - the implementation of hasArchetype(focus, oid)
was replaced by "getArchetypeOids(focus).contains(oid)".
This should resolve MID-7694, at least to some extent.
To be discussed.
Unrelated change:
- Yet another problem with task tracing (writing result with
incomplete="true" along with a real value) was fixed.
Commit: bd51661f2fcb24de535d90d6cbea235c5f1eabf7
https://github.com/Evolveum/midpoint/commit/bd51661f2fcb24de535d90d6cbea235c5f1eabf7
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-03-08 (Tue, 08 Mar 2022)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceTasksPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/PageTask.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.html
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/BaseEventImpl.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/CaseEventImpl.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/CaseManagementEventImpl.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/ResourceObjectEventImpl.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/TaskEventImpl.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/WorkItemAllocationEventImpl.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/WorkItemCustomEventImpl.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/WorkItemEventImpl.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/events/WorkItemLifecycleEventImpl.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/handlers/AggregatedEventHandler.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AbstractGeneralNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/AccountActivationNotifier.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/SimpleReportNotifier.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/Evolveum/midpoint/compare/e590fdbd6377...bd51661f2fcb
More information about the midPoint-svn
mailing list