fixing MID-2533, some changes

Evolveum · Sep 7, 2015 · d0bb504 · d0bb504
1 parent 4a21f82
commit d0bb504
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
@@ -70,8 +70,6 @@ public class PageOrgTree extends PageAdminUsers {
     private static final String DOT_CLASS = PageOrgTree.class.getName() + ".";
     private static final String OPERATION_LOAD_ORG_UNIT = DOT_CLASS + "loadOrgUnit";
 
-    public static TabbedPanel selectedTabbedPanel = null;
-
     private String ID_TABS = "tabs";
 
 
@@ -99,9 +97,7 @@ public WebMarkupContainer getPanel(String panelId) {
                                     protected void onEvent(final AjaxRequestTarget target) {
                                         SessionStorage storage = getSessionStorage();
                                         storage.getUsers().setSelectedTabId(tabId);
-                                        storage.getUsers().setExpandedItems(null);
                                     }
-
                                 }
                             );
                             return new TreeTablePanel(panelId, new Model(oid));

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
@@ -275,7 +275,6 @@ protected Component newContentComponent(String id, IModel<OrgTreeDto> model) {
                     protected void onClick(AjaxRequestTarget target) {
                         super.onClick(target);
 
-                        //todo selection is stored to session, find a place where to "load" this selection from session
                         MidPointAuthWebSession session = TreeTablePanel.this.getSession();
                         SessionStorage storage = session.getSessionStorage();
                         storage.getUsers().setSelectedItem(selected.getObject());
@@ -1434,11 +1433,10 @@ public Set<OrgTreeDto> getObject() {
             SessionStorage storage = session.getSessionStorage();
             Set<OrgTreeDto> dtos = storage.getUsers().getExpandedItems();
             Iterator<OrgTreeDto> iterator = provider.getRoots();
-            iterator = provider.getRoots();
             if (dtos != null && (dtos instanceof TreeStateSet)) {
                 for (OrgTreeDto orgTreeDto : dtos) {
                     if (!set.contains(orgTreeDto)) {
-                        set = (TreeStateSet<OrgTreeDto>) dtos;
+                        set.add(orgTreeDto);
                     }
                 }
             }