inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for CLOUD-2150: Trashcan for network admins only shows their deleted content.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@57583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2013-11-04 10:10:02 +00:00
parent 55e5a362dd
commit 418a758c97
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/repo/web/scripts/archive/AbstractArchivedNodeWebScript.java
View File

@@ -23,7 +23,6 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.alfresco.model.ContentModel;
import org.alfresco.query.PagingResults; import org.alfresco.query.PagingResults;
import org.alfresco.repo.node.archive.ArchivedNodesCannedQueryBuilder; import org.alfresco.repo.node.archive.ArchivedNodesCannedQueryBuilder;
import org.alfresco.repo.node.archive.NodeArchiveService; import org.alfresco.repo.node.archive.NodeArchiveService;
@@ -188,13 +187,9 @@ public abstract class AbstractArchivedNodeWebScript extends DeclarativeWebScript
protected void validatePermission(NodeRef nodeRef, String currentUser) protected void validatePermission(NodeRef nodeRef, String currentUser)
{ {
String archivedBy = (String) serviceRegistry.getNodeService().getProperty(nodeRef, ContentModel.PROP_ARCHIVED_BY); if (!nodeArchiveService.hasFullAccess(nodeRef))
if (!(currentUser.equals(archivedBy)))
{
if (!(serviceRegistry.getAuthorityService().isAdminAuthority(currentUser)))
{ {
throw new WebScriptException(Status.STATUS_FORBIDDEN, "You don't have permission to act on the node."); throw new WebScriptException(Status.STATUS_FORBIDDEN, "You don't have permission to act on the node.");
} }
} }
}
} }