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 @@ - CreateChildren + ChangePermissions manage_rules /images/icons/rule.gif 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 {