From 87b184032fd9fc303e733412130e8571d87faea7 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Wed, 7 Mar 2007 09:50:10 +0000
Subject: [PATCH] Merged V2.0 to HEAD    5116: AWC-1067, AWC-1126    5121:
 AR-1233 (from 1.4 via 2.0)    5129: AR-966    5131: Overlay copy and
 duplicate name

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5323 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/web-client-config-actions.xml              | 2 +-
 .../org/alfresco/web/bean/spaces/DeleteSpaceDialog.java    | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/config/alfresco/web-client-config-actions.xml b/config/alfresco/web-client-config-actions.xml
index 12fcd122cb..73f9731bdf 100644
--- a/config/alfresco/web-client-config-actions.xml
+++ b/config/alfresco/web-client-config-actions.xml
@@ -416,7 +416,7 @@
          <!-- Manage Space Rules -->
          <action id="manage_space_rules">
             <permissions>
-               <permission allow="true">CreateChildren</permission>
+               <permission allow="true">ChangePermissions</permission>
             </permissions>
             <label-id>manage_rules</label-id>
             <image>/images/icons/rule.gif</image>
diff --git a/source/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java b/source/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java
index 8de5f07439..effe201522 100644
--- a/source/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java
+++ b/source/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java
@@ -86,7 +86,12 @@ public class DeleteSpaceDialog extends BaseDialogBean
          
          if (DELETE_ALL.equals(this.deleteMode))
          {
-            this.nodeService.deleteNode(node.getNodeRef());
+            NodeRef nodeRef = node.getNodeRef();
+            if (this.nodeService.exists(nodeRef))
+            {
+               // The node still exists
+               this.nodeService.deleteNode(node.getNodeRef());
+            }
          }
          else
          {