inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.2) to HEAD (5.2)

Browse Source 
133613 cturlica: 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/HEAD/root@137311 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-14 16:46:07 +00:00
parent 5851af3029
commit c20b524add
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/rest/api/impl/GroupsImpl.java
View File

@@ -258,7 +258,16 @@ public class GroupsImpl implements Groups
Group group = new Group(); Group group = new Group();
group.setId(authorityInfo.getAuthorityName()); 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())); group.setIsRoot(isRootAuthority(rootAuthorities, authorityInfo.getAuthorityName()));
// Optionally include // Optionally include