From 76b6356a41bd07d0c649bc2c885d99f1962c9f1c Mon Sep 17 00:00:00 2001
From: Ramona Neamtu <ramona.popa@ness.com>
Date: Wed, 20 Jul 2016 15:24:53 +0000
Subject: [PATCH] MNT-16565 : [Site Activities] Group identifier appears
 instead of group name when changing the group's role    - Fixed activity
 dashlet display in case of role changed for group.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@128834 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/repo/site/SiteServiceImpl.java   | 68 ++++++++++---------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
index 92e335b98a..7ce9aea018 100644
--- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java
+++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
@@ -2523,39 +2523,43 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
                     }
 
                 }, AuthenticationUtil.SYSTEM_USER_NAME);
-
-                if (currentRole == null)
-                {
-                    AuthorityType authorityType = AuthorityType.getAuthorityType(authorityName);
-                    if (authorityType == AuthorityType.USER)
-                    {
-                        activityService.postActivity(
-                                ActivityType.SITE_USER_JOINED, shortName,
-                                ACTIVITY_TOOL, getActivityUserData(authorityName, role), authorityName);
-                    } 
-                    else if (authorityType == AuthorityType.GROUP)
+
+                AuthorityType authorityType = AuthorityType.getAuthorityType(authorityName);
+                String authorityDisplayName = authorityName;
+                if (authorityType == AuthorityType.GROUP)
+                {
+                    authorityDisplayName = authorityService.getAuthorityDisplayName(authorityName);
+                }
+
+                if (currentRole == null)
+                {
+                    if (authorityType == AuthorityType.USER)
+                    {
+                        activityService.postActivity(
+                                ActivityType.SITE_USER_JOINED, shortName,
+                                ACTIVITY_TOOL, getActivityUserData(authorityDisplayName, role), authorityName);
+                    } 
+                    else if (authorityType == AuthorityType.GROUP)
                     { 
-                        String authorityDisplayName = authorityService.getAuthorityDisplayName(authorityName);
-                        activityService.postActivity(
-                                ActivityType.SITE_GROUP_ADDED, shortName,
-                                ACTIVITY_TOOL, getActivityGroupData(authorityDisplayName, role));                   
-                    }
-                } 
-                else
-                {
-                    AuthorityType authorityType = AuthorityType.getAuthorityType(authorityName);
-                    if (authorityType == AuthorityType.USER)
-                    {
-                        activityService.postActivity(
-                                ActivityType.SITE_USER_ROLE_UPDATE, shortName,
-                                ACTIVITY_TOOL, getActivityUserData(authorityName, role));
-                    } 
-                    else if (authorityType == AuthorityType.GROUP)
-                    {
-                        activityService.postActivity(
-                                ActivityType.SITE_GROUP_ROLE_UPDATE, shortName,
-                                ACTIVITY_TOOL, getActivityGroupData(authorityName, role));
-                    }
+                        activityService.postActivity(
+                                ActivityType.SITE_GROUP_ADDED, shortName,
+                                ACTIVITY_TOOL, getActivityGroupData(authorityDisplayName, role));                   
+                    }
+                }
+                else
+                {
+                    if (authorityType == AuthorityType.USER)
+                    {
+                        activityService.postActivity(
+                                ActivityType.SITE_USER_ROLE_UPDATE, shortName,
+                                ACTIVITY_TOOL, getActivityUserData(authorityDisplayName, role));
+                    } 
+                    else if (authorityType == AuthorityType.GROUP)
+                    {
+                        activityService.postActivity(
+                                ActivityType.SITE_GROUP_ROLE_UPDATE, shortName,
+                                ACTIVITY_TOOL, getActivityGroupData(authorityDisplayName, role));
+                    }
                 }
             } 
             else