Merge branch 'master' into feature/policy-recording

Evolveum · Sep 25, 2017 · 4e143d3 · 4e143d3
2 parents ef245d7 + 6a0a2dd
commit 4e143d3
Show file tree

Hide file tree

Showing 34 changed files with 1,762 additions and 1,968 deletions.
diff --git a/...main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java b/...main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
@@ -57,6 +57,7 @@
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.web.session.UserProfileStorage.TableId;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ConstructionType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
 
@@ -278,8 +279,15 @@ protected int getItemsPerPage() {
 	}
 
 	protected ObjectQuery createObjectQuery() {
-		return QueryBuilder.queryFor(AssignmentType.class, getParentPage().getPrismContext()).item(new ItemPath(AssignmentType.F_TARGET_REF))
-				.ref(getRelation())
+		return QueryBuilder.queryFor(AssignmentType.class, getParentPage().getPrismContext())
+				.block()
+					.not()
+						.item(new ItemPath(AssignmentType.F_CONSTRUCTION, ConstructionType.F_RESOURCE_REF))
+							.isNull()
+				.endBlock()
+					.or()
+						.item(new ItemPath(AssignmentType.F_TARGET_REF))
+							.ref(getRelation())
 				.build();
 	};