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 (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
64434: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      62644: Fixed the CloudInvitationServiceImplTest test failures in the build. Also changed the Mange Sites required APIs which were wrapped in runAs System user (committed in r62555), to Admin.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-03-15 01:49:05 +00:00
parent d8e85072a4
commit fd031bcee8
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2299,11 +2299,9 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
// -- the member does not already have permissions // -- the member does not already have permissions
// ... then we can set the permissions as system user // ... then we can set the permissions as system user
final String currentUserName = AuthenticationUtil.getFullyAuthenticatedUser(); final String currentUserName = AuthenticationUtil.getFullyAuthenticatedUser();
return (isSiteAdmin(currentUserName) return ((permissionService.hasPermission(siteNodeRef, PermissionService.CHANGE_PERMISSIONS) == AccessStatus.ALLOWED)
|| (permissionService.hasPermission(siteNodeRef, PermissionService.CHANGE_PERMISSIONS) == AccessStatus.ALLOWED) || isSiteAdmin(currentUserName) || (SiteVisibility.PUBLIC.equals(visibility)
|| (SiteVisibility.PUBLIC.equals(visibility) && role.equals(SiteModel.SITE_CONSUMER) && authorityName.equals(currentUserName) && currentRole == null));
&& role.equals(SiteModel.SITE_CONSUMER)
&& authorityName.equals(currentUserName) && currentRole == null));
} }
/** /**

4
source/java/org/alfresco/repo/site/script/ScriptSiteService.java
View File

@@ -227,7 +227,7 @@ public class ScriptSiteService extends BaseScopableProcessorExtension
{ {
return getSites(filter, sitePresetFilter, size); return getSites(filter, sitePresetFilter, size);
} }
}, AuthenticationUtil.getSystemUserName()); }, AuthenticationUtil.getAdminUserName());
} }
else else
{ {
@@ -362,7 +362,7 @@ public class ScriptSiteService extends BaseScopableProcessorExtension
{ {
return siteService.getSite(shortName); return siteService.getSite(shortName);
} }
}, AuthenticationUtil.getSystemUserName()); }, AuthenticationUtil.getAdminUserName());
} }
else else
{ {

4
source/java/org/alfresco/repo/site/script/Site.java
View File

@@ -311,7 +311,7 @@ public class Site implements Serializable
siteService.updateSite(siteInfo); siteService.updateSite(siteInfo);
return null; return null;
} }
}, AuthenticationUtil.getSystemUserName()); }, AuthenticationUtil.getAdminUserName());
} }
else else
{ {
@@ -338,7 +338,7 @@ public class Site implements Serializable
siteService.deleteSite(siteInfo.getShortName()); siteService.deleteSite(siteInfo.getShortName());
return null; return null;
} }
}, AuthenticationUtil.getSystemUserName()); }, AuthenticationUtil.getAdminUserName());
} }
else else
{ {