MID-1780 fix.

Evolveum · Dec 23, 2014 · 0f5c644 · 0f5c644
1 parent e92100a
commit 0f5c644
Showing 1 changed file with 3 additions and 4 deletions.
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
@@ -175,7 +175,7 @@ protected void rowSelected(AjaxRequestTarget target, IModel<OrgTableDto> row, Op
 
             @Override
             public ObjectQuery createRootQuery(){
-                ArrayList<String> oids = new ArrayList<String>();
+                ArrayList<String> oids = new ArrayList<>();
                 ObjectQuery query = new ObjectQuery();
 
                 if(isMovingRoot() && getRootFromProvider() != null){
@@ -191,8 +191,7 @@ public ObjectQuery createRootQuery(){
                         for(OrgTableDto dto: objects){
                             oids.add(dto.getOid());
 
-                            //TODO - uncomment this, if parentOrgOid filtering is also required (see issue MID-1780)
-                            //oids.addAll(getOrgParentOids(dto.getOid()));
+                            oids.addAll(getOrgParentOids(dto.getOid()));
                         }
                     }
                 }
@@ -300,7 +299,7 @@ public String getObject() {
     }
 
     private List<String> getOrgParentOids(String orgOid){
-        List<String> parentOids = new ArrayList<String>();
+        List<String> parentOids = new ArrayList<>();
         OperationResult result = new OperationResult(OPERATION_LOAD_PARENTS);
         PrismObject<OrgType> org = WebModelUtils.loadObject(OrgType.class, orgOid, result, getPageBase());
         OrgType orgObject = org.asObjectable();