From 7d5bf5ce5ac718801ac12e7bd2a3746ce2c06830 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 18 Sep 2014 17:15:06 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 83864: Merged KEVINR1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 83697: ACE-2644 - Administrator Node Browser (in-process) functional parity of Explorer Permissions, owner, inherits. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84585 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/slingshot/web/scripts/NodeBrowserScript.java | 1 - 1 file changed, 1 deletion(-) diff --git a/source/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java b/source/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java index 9d83d3c771..15d41fe50c 100644 --- a/source/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java +++ b/source/java/org/alfresco/slingshot/web/scripts/NodeBrowserScript.java @@ -545,7 +545,6 @@ public class NodeBrowserScript extends DeclarativeWebScript permissionInfo.put("entries", getPermissions(nodeRef)); permissionInfo.put("owner", this.getOwnableService().getOwner(nodeRef)); permissionInfo.put("inherit", this.getInheritPermissions(nodeRef)); - permissionInfo.put("entries", getPermissions(nodeRef)); permissionInfo.put("storePermissions", getStorePermissionMasks(nodeRef)); Map model = new HashMap();