From 49f9e3d0e8fed012b3690dcac4ccafb5657fd8d3 Mon Sep 17 00:00:00 2001 From: Ramona Neamtu Date: Mon, 4 Jul 2016 10:51:19 +0000 Subject: [PATCH] Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 128509 rneamtu: MNT-16488 : CLONE - Activities dashlet displays group indentifier instead of group name - Added activiti for add/remove group to the site with autorityDisplayName instead of authorityName git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128529 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/repo/site/SiteServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java index 31aaf020de..92e335b98a 100644 --- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java +++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java @@ -2423,10 +2423,11 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic ACTIVITY_TOOL, getActivityUserData(authorityName, ""), authorityName); } else if (authorityType == AuthorityType.GROUP) - { + { + String authorityDisplayName = authorityService.getAuthorityDisplayName(authorityName); activityService.postActivity( ActivityType.SITE_GROUP_REMOVED, shortName, - ACTIVITY_TOOL, getActivityGroupData(authorityName, "")); + ACTIVITY_TOOL, getActivityGroupData(authorityDisplayName, "")); } } else @@ -2533,10 +2534,11 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic ACTIVITY_TOOL, getActivityUserData(authorityName, role), authorityName); } else if (authorityType == AuthorityType.GROUP) - { + { + String authorityDisplayName = authorityService.getAuthorityDisplayName(authorityName); activityService.postActivity( ActivityType.SITE_GROUP_ADDED, shortName, - ACTIVITY_TOOL, getActivityGroupData(authorityName, role)); + ACTIVITY_TOOL, getActivityGroupData(authorityDisplayName, role)); } } else