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

ALFCOM-3083

Browse Source 
- bug fix to previous check in CHK-8031

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15026 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2009-06-30 09:22:05 +00:00
parent b2cd89e945
commit 7c377f5bf8
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1287,13 +1287,14 @@ public class SiteServiceImpl implements SiteService, SiteModel
}, AuthenticationUtil.SYSTEM_USER_NAME); }, AuthenticationUtil.SYSTEM_USER_NAME);
// Raise events // Raise events
if (AuthorityType.getAuthorityType(authorityName) == AuthorityType.USER) AuthorityType authorityType = AuthorityType.getAuthorityType(authorityName);
if (authorityType == AuthorityType.USER)
{ {
activityService.postActivity( activityService.postActivity(
ActivityType.SITE_USER_REMOVED, shortName, ActivityType.SITE_USER_REMOVED, shortName,
ACTIVITY_TOOL, getActivityUserData(authorityName, "")); ACTIVITY_TOOL, getActivityUserData(authorityName, ""));
} }
else else if (authorityType == AuthorityType.GROUP)
{ {
activityService.postActivity( activityService.postActivity(
ActivityType.SITE_GROUP_REMOVED, shortName, ActivityType.SITE_GROUP_REMOVED, shortName,
@@ -1390,13 +1391,14 @@ public class SiteServiceImpl implements SiteService, SiteModel
if (currentRole == null) if (currentRole == null)
{ {
if (AuthorityType.getAuthorityType(authorityName) == AuthorityType.USER) AuthorityType authorityType = AuthorityType.getAuthorityType(authorityName);
if (authorityType == AuthorityType.USER)
{ {
activityService.postActivity( activityService.postActivity(
ActivityType.SITE_USER_JOINED, shortName, ActivityType.SITE_USER_JOINED, shortName,
ACTIVITY_TOOL, getActivityUserData(authorityName, role)); ACTIVITY_TOOL, getActivityUserData(authorityName, role));
} }
else else if (authorityType == AuthorityType.GROUP)
{ {
activityService.postActivity( activityService.postActivity(
ActivityType.SITE_GROUP_ADDED, shortName, ActivityType.SITE_GROUP_ADDED, shortName,
@@ -1405,17 +1407,18 @@ public class SiteServiceImpl implements SiteService, SiteModel
} }
else else
{ {
if (AuthorityType.getAuthorityType(authorityName) == AuthorityType.USER) AuthorityType authorityType = AuthorityType.getAuthorityType(authorityName);
if (authorityType == AuthorityType.USER)
{ {
activityService.postActivity( activityService.postActivity(
ActivityType.SITE_USER_ROLE_UPDATE, shortName, ActivityType.SITE_USER_ROLE_UPDATE, shortName,
ACTIVITY_TOOL, getActivityUserData(authorityName, role)); ACTIVITY_TOOL, getActivityUserData(authorityName, role));
} }
else else if (authorityType == AuthorityType.GROUP)
{ {
activityService.postActivity( activityService.postActivity(
ActivityType.SITE_GROUP_ROLE_UPDATE, shortName, ActivityType.SITE_GROUP_ROLE_UPDATE, shortName,
ACTIVITY_TOOL, getActivityUserData(authorityName, role)); ACTIVITY_TOOL, getActivityGroupData(authorityName, role));
} }
} }
} }