Merge remote-tracking branch 'origin/master'

Evolveum · Sep 3, 2018 · cb05bbf · cb05bbf
2 parents d4c2067 + eff7a31
commit cb05bbf
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/...i/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java b/...i/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java
@@ -32,8 +32,6 @@
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.page.admin.users.PageOrgTree;
-import com.evolveum.midpoint.web.page.admin.users.PageUsers;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
 import org.apache.wicket.Component;
 import org.apache.wicket.RestartResponseException;
@@ -108,12 +106,22 @@ public Iterator<? extends SelectableBean<OrgType>> getChildren(SelectableBean<Or
             LOGGER.debug("Loading fresh children for {}", node.getValue());
             OperationResult result = new OperationResult(LOAD_ORG_UNITS);
             try {
-                ObjectQuery query = QueryBuilder.queryFor(ObjectType.class, getPageBase().getPrismContext())
+                ObjectQuery query = QueryBuilder.queryFor(OrgType.class, getPageBase().getPrismContext())
                         .isDirectChildOf(nodeOid)
-                        .asc(ObjectType.F_NAME)
                         .build();
                 Task task = getPageBase().createSimpleTask(LOAD_ORG_UNITS);
                 List<PrismObject<OrgType>> orgs = getModelService().searchObjects(OrgType.class, query, null, task, result);
+                Collections.sort(orgs, new Comparator<PrismObject<OrgType>>() {
+
+                    @Override
+                    public int compare(PrismObject<OrgType> o1, PrismObject<OrgType> o2) {
+                        String s1 = WebComponentUtil.getDisplayNameOrName(o1);
+                        String s2 = WebComponentUtil.getDisplayNameOrName(o2);
+
+                        return String.CASE_INSENSITIVE_ORDER.compare(s1, s2);
+                    }
+                });
+
                 LOGGER.debug("Found {} sub-orgs.", orgs.size());
                 children = new ArrayList<>();
                 for (PrismObject<OrgType> org : orgs) {