MID-7921 user select popup find&select

Evolveum · May 16, 2022 · 4a6ea55 · 4a6ea55
1 parent 2451d17
commit 4a6ea55
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AssignmentPopup.java
@@ -526,7 +526,7 @@ protected boolean isEntitlementAssignment() {
 
     private int getTabPanelSelectedCount(WebMarkupContainer panel) {
         if (panel instanceof AbstractAssignmentPopupTabPanel) {
-            return ((AbstractAssignmentPopupTabPanel) panel).getSelectedObjectsList().size();
+            return ((AbstractAssignmentPopupTabPanel) panel).getPreselectedObjects().size();
         }
         return 0;
     }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java
@@ -136,8 +136,7 @@ public void onClick(AjaxRequestTarget target) {
                     if (memberPanel.getObjectType().equals(ObjectTypes.ORG) && orgPanelProcessed){
                         continue;
                     }
-                    List<ObjectType> selectedObjects = memberPanel.getObjectType().equals(ObjectTypes.ORG) ? memberPanel.getPreselectedObjects() :
-                            memberPanel.getSelectedObjectsList();
+                    List<ObjectType> selectedObjects = memberPanel.getPreselectedObjects();
 
                     if (selectedObjects == null || selectedObjects.size() == 0){
                         continue;
@@ -363,7 +362,7 @@ protected List<ObjectReferenceType> getArchetypeRefList(){
 
     protected int getTabPanelSelectedCount(WebMarkupContainer panel){
         if (panel != null && panel instanceof MemberPopupTabPanel){
-            return ((MemberPopupTabPanel) panel).getSelectedObjectsList().size();
+            return ((MemberPopupTabPanel) panel).getPreselectedObjects().size();
         }
         return 0;
     }

diff --git a/...c/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java b/...c/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java
@@ -105,7 +105,7 @@ protected Map<String, AssignmentType> getSelectedAssignmentsMap() {
         Map<String, AssignmentType> assignmentsMap = new HashMap<>();
 
 //        List<F> selectedObjects = getObjectType().equals(ObjectTypes.ORG) ? getPreselectedObjects() : getSelectedObjectsList();
-        List<F> selectedObjects = getSelectedObjectsList();
+        List<F> selectedObjects = getPreselectedObjects();
         QName relation = getRelationValue();
         selectedObjects.forEach(selectedObject -> assignmentsMap.put(
                 selectedObject.getOid(),

diff --git a/...gui/src/main/java/com/evolveum/midpoint/gui/api/component/OrgTreeMemberPopupTabPanel.java b/...gui/src/main/java/com/evolveum/midpoint/gui/api/component/OrgTreeMemberPopupTabPanel.java
@@ -67,6 +67,7 @@ protected boolean isObjectListPanelVisible(){
         return false;
     }
 
+    @Override
     protected List<OrgType> getSelectedObjectsList(){
         return getPreselectedObjects();
     }

diff --git a/...ain/java/com/evolveum/midpoint/gui/api/component/ResourceTypeAssignmentPopupTabPanel.java b/...ain/java/com/evolveum/midpoint/gui/api/component/ResourceTypeAssignmentPopupTabPanel.java
@@ -231,7 +231,7 @@ private void intentValueUpdatePerformed(AjaxRequestTarget target) {
     protected Map<String, AssignmentType> getSelectedAssignmentsMap() {
         Map<String, AssignmentType> assignmentList = new HashMap<>();
 
-        List<ResourceType> selectedObjects = getSelectedObjectsList();
+        List<ResourceType> selectedObjects = getPreselectedObjects();
         ShadowKindType kind = getKindValue();
         String intent = getIntentValue();
         selectedObjects.forEach(selectedObject -> {