From 07e74b87b203f4a99304e032405bdca08e8ac343 Mon Sep 17 00:00:00 2001
From: Mike Hatfield <mike.hatfield@alfresco.com>
Date: Fri, 22 Aug 2008 12:44:47 +0000
Subject: [PATCH] resetAllPermissions needed to check for inherited flag

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10494 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/repo/site/script/Site.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/site/script/Site.java b/source/java/org/alfresco/repo/site/script/Site.java
index 39593d66b7..91418f8a9f 100644
--- a/source/java/org/alfresco/repo/site/script/Site.java
+++ b/source/java/org/alfresco/repo/site/script/Site.java
@@ -474,8 +474,13 @@ public class Site implements Serializable
                     public Object doWork() throws Exception
                     {
                         // Reset all the permissions on the node
-                        serviceRegistry.getPermissionService().setInheritParentPermissions(nodeRef, true);
-                        serviceRegistry.getPermissionService().deletePermissions(nodeRef);
+                    	PermissionService permissionService = serviceRegistry.getPermissionService();
+                    	// Ensure node isn't inheriting permissions from an ancestor
+                    	if (!permissionService.getInheritParentPermissions(nodeRef))
+                    	{
+                            permissionService.deletePermissions(nodeRef);
+                            permissionService.setInheritParentPermissions(nodeRef, true);
+                    	}
                         return null;
                     }