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 BRANCHES/DEV/V4.1-BUG-FIX to HEAD:

Browse Source 
41591: MT: ALF-12732 - fix move between two sites (via Share -> ScriptSiteService)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41595 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2012-09-14 11:25:37 +00:00
parent 966dfd2566
commit 6ec5fe4f27
3 changed files with 68 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/repo/site/SitesPermissionCleaner.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
* Copyright (C) 2005-2012 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -27,6 +27,7 @@ import org.alfresco.repo.domain.permissions.AclDAO;
import org.alfresco.repo.security.permissions.ACLType;
import org.alfresco.repo.security.permissions.AccessControlEntry;
import org.alfresco.repo.security.permissions.AccessControlList;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.AccessStatus;
@@ -51,6 +52,7 @@ public class SitesPermissionCleaner
private AclDAO aclDAO;
private NodeDAO nodeDAO;
private TenantService tenantService;
public void setNodeService(NodeService nodeService)
{
@@ -82,6 +84,12 @@ public class SitesPermissionCleaner
this.nodeDAO = nodeDAO;
}
public void setTenantService(TenantService tenantService)
{
this.tenantService = tenantService;
}
public void cleanSitePermissions(final NodeRef targetNode, SiteInfo containingSite)
{
if (nodeService.exists(targetNode))
@@ -96,8 +104,8 @@ public class SitesPermissionCleaner
if (containingSite != null)
{
// For performance reasons we navigate down the containment hierarchy using the DAOs
// rather than the NodeService.
final Long targetNodeID = nodeDAO.getNodePair(targetNode).getFirst();
// rather than the NodeService. Note: direct use of NodeDAO requires tenantService (ALF-12732).
final Long targetNodeID = nodeDAO.getNodePair(tenantService.getName(targetNode)).getFirst();
final Long targetNodeAclID = nodeDAO.getNodeAclId(targetNodeID);
Acl targetNodeAcl = aclDAO.getAcl(targetNodeAclID);