From 418a758c9747526311e452cba89ef83910017c01 Mon Sep 17 00:00:00 2001 From: Jamal Kaabi-Mofrad Date: Mon, 4 Nov 2013 10:10:02 +0000 Subject: [PATCH] fix for CLOUD-2150: Trashcan for network admins only shows their deleted content. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@57583 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../scripts/archive/AbstractArchivedNodeWebScript.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/archive/AbstractArchivedNodeWebScript.java b/source/java/org/alfresco/repo/web/scripts/archive/AbstractArchivedNodeWebScript.java index a97245a94c..d683fb677e 100644 --- a/source/java/org/alfresco/repo/web/scripts/archive/AbstractArchivedNodeWebScript.java +++ b/source/java/org/alfresco/repo/web/scripts/archive/AbstractArchivedNodeWebScript.java @@ -23,7 +23,6 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; -import org.alfresco.model.ContentModel; import org.alfresco.query.PagingResults; import org.alfresco.repo.node.archive.ArchivedNodesCannedQueryBuilder; import org.alfresco.repo.node.archive.NodeArchiveService; @@ -188,13 +187,9 @@ public abstract class AbstractArchivedNodeWebScript extends DeclarativeWebScript protected void validatePermission(NodeRef nodeRef, String currentUser) { - String archivedBy = (String) serviceRegistry.getNodeService().getProperty(nodeRef, ContentModel.PROP_ARCHIVED_BY); - if (!(currentUser.equals(archivedBy))) + if (!nodeArchiveService.hasFullAccess(nodeRef)) { - 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."); } } } \ No newline at end of file