Fixed MID-4127: OrgTree - does not visualize members when org is disa…

…bled
Evolveum · Sep 12, 2017 · 0b4d9b2 · 0b4d9b2
1 parent 8a3c544
commit 0b4d9b2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 17 deletions.
diff --git a/...l/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java b/...l/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
@@ -673,12 +673,7 @@ private void evaluateSegmentTarget(AssignmentPathSegmentImpl segment, PlusMinusZ
 
 		boolean isTargetValid = LensUtil.isFocusValid(targetType, now, activationComputer);
 		if (!isTargetValid) {
-			if (!segment.isValidityOverride()) {
-				LOGGER.trace("Skipping evaluation of {} because it is not valid and validityOverride is not set", targetType);
-				return;
-			} else {
-				isValid = false;
-			}
+			isValid = false;
 		}
 
 		LOGGER.debug("Evaluating RBAC [{}]", ctx.assignmentPath.shortDumpLazily());
@@ -720,15 +715,16 @@ private void evaluateSegmentTarget(AssignmentPathSegmentImpl segment, PlusMinusZ
 		ctx.evalAssignment.addRole(evalAssignmentTarget, relativeMode);
 
 		// we need to evaluate assignments also for disabled targets, because of target policy rules
-		for (AssignmentType roleAssignment : targetType.getAssignment()) {
-			evaluateAssignment(segment, relativeMode, isValid, ctx, targetType, relation, roleAssignment);
+		// ... but only for direct ones!
+		if (isTargetValid || ctx.assignmentPath.size() == 1) {
+			for (AssignmentType roleAssignment : targetType.getAssignment()) {
+				evaluateAssignment(segment, relativeMode, isValid, ctx, targetType, relation, roleAssignment);
+			}
 		}
 
+		// we need to collect membership also for disabled targets (provided the assignment itself is enabled): MID-4127
 		if ((isNonNegative(relativeMode)) && segment.isProcessMembership()) {
-			if (isTargetValid || !ObjectTypeUtil.isMembershipRelation(relation)) {
-				// we want to collect approver/owner/whatever-non-membership relations also for disabled targets (MID-3942)
-				collectMembership(targetType, relation, ctx);
-			}
+			collectMembership(targetType, relation, ctx);
 		}
 
 		if (!isTargetValid) {

diff --git a/...el-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java b/...el-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java
@@ -636,9 +636,9 @@ public void test110AssignR1ToJack() throws Exception {
 		EvaluatedAssignmentImpl<UserType> evaluatedAssignment = evaluatedAssignments.iterator().next();
 		assertEquals("Wrong evaluatedAssignment.isValid", true, evaluatedAssignment.isValid());
 
-		assertTargets(evaluatedAssignment, true, "R1", null, null, null, null, null);
-		assertTargets(evaluatedAssignment, false, "MR1", null, null, null, null, null);
-		assertMembershipRef(evaluatedAssignment, "R1");
+		assertTargets(evaluatedAssignment, true, "R1", "R2 R4", null, null, null, null);
+		assertTargets(evaluatedAssignment, false, "MR1", "MMR1 MR3", null, null, null, null);
+		assertMembershipRef(evaluatedAssignment, "R1 R2 R4");
 		assertOrgRef(evaluatedAssignment, null);
 		assertDelegation(evaluatedAssignment, null);
 
@@ -799,9 +799,9 @@ public void test210AssignR1ToJack() throws Exception {
 		assertEquals("Wrong evaluatedAssignment.isValid", true, evaluatedAssignment.isValid());
 
 		// R4 is not in plusInvalid, because only directly assigned targets are listed among targets (see validityOverride)
-		assertTargets(evaluatedAssignment, true, "R1", null, "", null, "R2", null);
+		assertTargets(evaluatedAssignment, true, "R1", null, "", "R4", "R2", null);
 		assertTargets(evaluatedAssignment, false, "", null, "MR1 MMR1", null, "MR2", null);
-		assertMembershipRef(evaluatedAssignment, "R1");
+		assertMembershipRef(evaluatedAssignment, "R1 R4");
 		assertOrgRef(evaluatedAssignment, null);
 		assertDelegation(evaluatedAssignment, null);