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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
84025: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      82649: Merged DEV to V4.2-BUG-FIX (4.2.4)
         82512: MNT-12282 : Site manager's avatar overrides others in Activities dashlet
         Changed the removeMembership activity generation to be done on behalf of the removed user.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84616 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-09-18 17:20:31 +00:00
parent 4e7e8ae44b
commit afcee48923
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2013 Alfresco Software Limited. * Copyright (C) 2005-2014 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -2427,7 +2427,7 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
{ {
activityService.postActivity( activityService.postActivity(
ActivityType.SITE_USER_REMOVED, shortName, ActivityType.SITE_USER_REMOVED, shortName,
ACTIVITY_TOOL, getActivityUserData(authorityName, "")); ACTIVITY_TOOL, getActivityUserData(authorityName, ""), authorityName);
} }
else if (authorityType == AuthorityType.GROUP) else if (authorityType == AuthorityType.GROUP)
{ {