From 0f5c644324da0f574f084dfc2ede306f2538a053 Mon Sep 17 00:00:00 2001
From: erik <erik.suta@evolveum.com>
Date: Tue, 23 Dec 2014 16:21:56 +0100
Subject: [PATCH] MID-1780 fix.

---
 .../web/page/admin/users/component/TreeTablePanel.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
index ba3e728b56d..91ffb5e096f 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
+++ b/gui/admin-gui/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();