assignments table type fix

Evolveum · Dec 15, 2020 · 093feb5 · 093feb5
1 parent 452ac22
commit 093feb5
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
@@ -386,6 +386,20 @@ protected ObjectQuery getCustomizeQuery() {
         archetypeFilter.setOidNullAsAny(true);
         archetypeFilter.setRelationNullAsAny(true);
 
+        QName targetType = getAssignmentType();
+        RefFilter targetRefFilter = null;
+        if (targetType != null) {
+            ObjectReferenceType ort = new ObjectReferenceType();
+            ort.setType(targetType);
+            ort.setRelation(new QName(PrismConstants.NS_QUERY, "any"));
+            targetRefFilter = (RefFilter) getParentPage().getPrismContext().queryFor(AssignmentType.class)
+                    .item(AssignmentType.F_TARGET_REF)
+                    .ref(ort.asReferenceValue())
+                    .buildFilter();
+            targetRefFilter.setOidNullAsAny(true);
+            targetRefFilter.setRelationNullAsAny(true);
+        }
+
         ObjectFilter relationFilter = getParentPage().getPrismContext().queryFor(AssignmentType.class)
                 .not()
                 .item(AssignmentType.F_TARGET_REF)
@@ -394,6 +408,9 @@ protected ObjectQuery getCustomizeQuery() {
 
         ObjectQuery query = getPrismContext().queryFactory().createQuery(relationFilter);
         query.addFilter(getPrismContext().queryFactory().createNot(archetypeFilter));
+        if (targetRefFilter != null) {
+            query.addFilter(targetRefFilter);
+        }
         return query;
     }