inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
128529 rneamtu: 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/HEAD/root@129292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 13:57:04 +00:00
parent 6dc6e5db3c
commit 72032949f5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/repo/site/SiteServiceImpl.java
View File

@@ -2423,10 +2423,11 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
ACTIVITY_TOOL, getActivityUserData(authorityName, ""), authorityName); ACTIVITY_TOOL, getActivityUserData(authorityName, ""), authorityName);
} }
else if (authorityType == AuthorityType.GROUP) else if (authorityType == AuthorityType.GROUP)
{ {
String authorityDisplayName = authorityService.getAuthorityDisplayName(authorityName);
activityService.postActivity( activityService.postActivity(
ActivityType.SITE_GROUP_REMOVED, shortName, ActivityType.SITE_GROUP_REMOVED, shortName,
ACTIVITY_TOOL, getActivityGroupData(authorityName, "")); ACTIVITY_TOOL, getActivityGroupData(authorityDisplayName, ""));
} }
} }
else else
@@ -2533,10 +2534,11 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
ACTIVITY_TOOL, getActivityUserData(authorityName, role), authorityName); ACTIVITY_TOOL, getActivityUserData(authorityName, role), authorityName);
} }
else if (authorityType == AuthorityType.GROUP) else if (authorityType == AuthorityType.GROUP)
{ {
String authorityDisplayName = authorityService.getAuthorityDisplayName(authorityName);
activityService.postActivity( activityService.postActivity(
ActivityType.SITE_GROUP_ADDED, shortName, ActivityType.SITE_GROUP_ADDED, shortName,
ACTIVITY_TOOL, getActivityGroupData(authorityName, role)); ACTIVITY_TOOL, getActivityGroupData(authorityDisplayName, role));
} }
} }
else else