Merge remote-tracking branch 'origin/master'

Evolveum · Sep 4, 2018 · 1b86178 · 1b86178
2 parents 69c3828 + 1d6ca41
commit 1b86178
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java b/...main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
@@ -335,7 +335,7 @@ protected ObjectQuery createObjectQuery() {
                     .item(new ItemPath(AssignmentType.F_CONSTRUCTION, ConstructionType.F_RESOURCE_REF))
                     .isNull()
                     .endBlock()
-                    .or()
+                    .and()
                     .block()
                     .not()
                     .item(new ItemPath(AssignmentType.F_TARGET_REF))