assignment counter fix

Evolveum · Sep 13, 2021 · 8ec6e13 · 8ec6e13
1 parent e969655
commit 8ec6e13
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -4833,6 +4833,13 @@ public static boolean isArchetypeAssignment(AssignmentType assignmentType) {
         return QNameUtil.match(assignmentType.getTargetRef().getType(), ArchetypeType.COMPLEX_TYPE);
     }
 
+    public static boolean isDelegationAssignment(AssignmentType assignmentType) {
+        if (assignmentType.getTargetRef() == null) {
+            return false;
+        }
+        return QNameUtil.match(assignmentType.getTargetRef().getType(), UserType.COMPLEX_TYPE);
+    }
+
     public static <AH extends AssignmentHolderType> boolean hasArchetypeAssignment(AH assignmentHolder, String archetypeOid) {
         if (assignmentHolder.getAssignment() == null) {
             return false;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/AssignmentCounter.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/AssignmentCounter.java
@@ -39,7 +39,7 @@ public int count(AssignmentHolderDetailsModel<AH> objectDetailsModels, PageBase
         List<AssignmentType> assignments = object.getAssignment();
         int count = 0;
         for (AssignmentType assignment : assignments) {
-            if (WebComponentUtil.isArchetypeAssignment(assignment)) {
+            if (WebComponentUtil.isArchetypeAssignment(assignment) || WebComponentUtil.isDelegationAssignment(assignment)) {
                 continue;
             }
             count++;