fix for MID-6678 - expanding org tree when clicking '+' button

Evolveum · Nov 2, 2020 · 2e84b21 · 2e84b21
1 parent 84049ee
commit 2e84b21
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.java
@@ -40,10 +40,7 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 public class OrgTreePanel extends AbstractTreeTablePanel {
     private static final long serialVersionUID = 1L;
@@ -447,8 +444,17 @@ public void setExpandedItems(TreeStateSet items, OrgTreeStateStorage storage){
     }
 
     public void addExpandedItem(TreeSelectableBean<OrgType> item, OrgTreeStateStorage storage){
-        if (storage != null && storage.getExpandedItems() != null){
-            storage.getExpandedItems().add(item);
+        if (storage == null) {
+            return;
+        }
+
+        Set<TreeSelectableBean<OrgType>> expandedItems = storage.getExpandedItems();
+        if (expandedItems == null) {
+            TreeStateSet<TreeSelectableBean<OrgType>> expanded = new TreeStateSet<>();
+            expanded.add(item);
+            storage.setExpandedItems(expanded);
+        } else {
+            expandedItems.add(item);
         }
     }