From 7c377f5bf80bbc99b399a45729c8830def94aad4 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Tue, 30 Jun 2009 09:22:05 +0000 Subject: [PATCH] ALFCOM-3083 - 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 --- .../org/alfresco/repo/site/SiteServiceImpl.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java index d221f307a8..251095af89 100644 --- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java +++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java @@ -1287,13 +1287,14 @@ public class SiteServiceImpl implements SiteService, SiteModel }, AuthenticationUtil.SYSTEM_USER_NAME); // Raise events - if (AuthorityType.getAuthorityType(authorityName) == AuthorityType.USER) + AuthorityType authorityType = AuthorityType.getAuthorityType(authorityName); + if (authorityType == AuthorityType.USER) { activityService.postActivity( ActivityType.SITE_USER_REMOVED, shortName, ACTIVITY_TOOL, getActivityUserData(authorityName, "")); } - else + else if (authorityType == AuthorityType.GROUP) { activityService.postActivity( ActivityType.SITE_GROUP_REMOVED, shortName, @@ -1390,13 +1391,14 @@ public class SiteServiceImpl implements SiteService, SiteModel if (currentRole == null) { - if (AuthorityType.getAuthorityType(authorityName) == AuthorityType.USER) + AuthorityType authorityType = AuthorityType.getAuthorityType(authorityName); + if (authorityType == AuthorityType.USER) { activityService.postActivity( ActivityType.SITE_USER_JOINED, shortName, ACTIVITY_TOOL, getActivityUserData(authorityName, role)); } - else + else if (authorityType == AuthorityType.GROUP) { activityService.postActivity( ActivityType.SITE_GROUP_ADDED, shortName, @@ -1405,17 +1407,18 @@ public class SiteServiceImpl implements SiteService, SiteModel } else { - if (AuthorityType.getAuthorityType(authorityName) == AuthorityType.USER) + AuthorityType authorityType = AuthorityType.getAuthorityType(authorityName); + if (authorityType == AuthorityType.USER) { activityService.postActivity( ActivityType.SITE_USER_ROLE_UPDATE, shortName, ACTIVITY_TOOL, getActivityUserData(authorityName, role)); } - else + else if (authorityType == AuthorityType.GROUP) { activityService.postActivity( ActivityType.SITE_GROUP_ROLE_UPDATE, shortName, - ACTIVITY_TOOL, getActivityUserData(authorityName, role)); + ACTIVITY_TOOL, getActivityGroupData(authorityName, role)); } } }