From 382edd6287ffddc05fc336ebbcd4fcef0e4bc5cf Mon Sep 17 00:00:00 2001 From: Katarina Valalikova Date: Mon, 6 Apr 2020 16:31:19 +0200 Subject: [PATCH] changing assignmentRelationApproach into assignmentHolderRelationApproach. and later assignmentTargetRelationApproach can come. --- .../src/main/resources/xml/ns/public/common/common-core-3.xsd | 2 +- .../model/impl/controller/ModelInteractionServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd index 2282242d72e..4ceaf55d4e1 100755 --- a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd +++ b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd @@ -15025,7 +15025,7 @@ - +

diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java index 9347be64bce..ab98af98097 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java @@ -1790,7 +1790,7 @@ private AssignmentCandidatesSpecification determineArchetypeAssignmentCandidateS } spec.setAssignmentObjectRelations(assignmentHolderRelations); spec.setSupportGenericAssignment(archetypePolicy == null - || AssignmentRelationApproachType.CLOSED != archetypePolicy.getAssignmentRelationApproach()); + || AssignmentRelationApproachType.CLOSED != archetypePolicy.getAssignmentHolderRelationApproach()); return spec; }