mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.0 to HEAD
12145: Merged V2.2 to V3.0 (AuthenticationUtil) 12109: AuthenticationUtil and AuthenticationComponent refactor 12152: Removed Lucene usage from lookup of 'sites' root folder 12153: Fix InviteServiceTest by cleaning up leaking authentications 12159: Fix for broken usage pattern of the Threadlocal values in recent AuthenticationUtil refactor. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -144,7 +144,7 @@ public class SandboxServiceImpl extends WCMUtil implements SandboxService
|
||||
{
|
||||
ParameterCheck.mandatoryString("wpStoreId", wpStoreId);
|
||||
|
||||
String currentUserName = AuthenticationUtil.getCurrentEffectiveUserName();
|
||||
String currentUserName = AuthenticationUtil.getRunAsUser();
|
||||
SandboxInfo sbInfo = null;
|
||||
|
||||
if (! wpService.isWebUser(wpStoreId, currentUserName))
|
||||
@@ -228,7 +228,7 @@ public class SandboxServiceImpl extends WCMUtil implements SandboxService
|
||||
{
|
||||
ParameterCheck.mandatoryString("wpStoreId", wpStoreId);
|
||||
|
||||
return sandboxFactory.listSandboxes(wpStoreId, AuthenticationUtil.getCurrentEffectiveUserName());
|
||||
return sandboxFactory.listSandboxes(wpStoreId, AuthenticationUtil.getRunAsUser());
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
@@ -280,7 +280,7 @@ public class SandboxServiceImpl extends WCMUtil implements SandboxService
|
||||
{
|
||||
ParameterCheck.mandatoryString("wpStoreId", wpStoreId);
|
||||
|
||||
String currentUserName = AuthenticationUtil.getCurrentEffectiveUserName();
|
||||
String currentUserName = AuthenticationUtil.getRunAsUser();
|
||||
return getSandbox(WCMUtil.buildUserMainStoreName(WCMUtil.buildStagingStoreName(wpStoreId), currentUserName));
|
||||
}
|
||||
|
||||
@@ -319,7 +319,7 @@ public class SandboxServiceImpl extends WCMUtil implements SandboxService
|
||||
|
||||
String wpStoreId = WCMUtil.getWebProjectStoreId(sbStoreId);
|
||||
|
||||
String currentUserName = AuthenticationUtil.getCurrentEffectiveUserName();
|
||||
String currentUserName = AuthenticationUtil.getRunAsUser();
|
||||
if (sbStoreId.equals(WCMUtil.buildUserMainStoreName(wpStoreId, currentUserName)))
|
||||
{
|
||||
// author may delete their own sandbox
|
||||
|
Reference in New Issue
Block a user