From 1622adeab03a88044dc024fcd90f5190b0917bcf Mon Sep 17 00:00:00 2001 From: Cristian Turlica Date: Tue, 13 Dec 2016 13:56:15 +0000 Subject: [PATCH] REPO-1743: Bug ? - list groups - orderBy displayName - made the sort consistent and display the shortName when authorityDisplayName isn't present (same as it's done when sorting by authorityDisplayName) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/rest/api/impl/GroupsImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/rest/api/impl/GroupsImpl.java b/source/java/org/alfresco/rest/api/impl/GroupsImpl.java index 52461d90d1..cb680d342b 100644 --- a/source/java/org/alfresco/rest/api/impl/GroupsImpl.java +++ b/source/java/org/alfresco/rest/api/impl/GroupsImpl.java @@ -258,7 +258,16 @@ public class GroupsImpl implements Groups Group group = new Group(); group.setId(authorityInfo.getAuthorityName()); - group.setDisplayName(authorityInfo.getAuthorityDisplayName()); + + // REPO-1743 + String authorityDisplayName = authorityInfo.getAuthorityDisplayName(); + if (authorityDisplayName == null || authorityDisplayName.isEmpty()) + { + authorityDisplayName = authorityService.getAuthorityDisplayName(authorityInfo.getAuthorityName()); + } + + group.setDisplayName(authorityDisplayName); + group.setIsRoot(isRootAuthority(rootAuthorities, authorityInfo.getAuthorityName())); // Optionally include