inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.0 to HEAD

Browse Source 
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
This commit is contained in:
Derek Hulley
2007-03-07 09:50:10 +00:00
parent 1828757e80
commit 87b184032f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/web-client-config-actions.xml
View File

@@ -416,7 +416,7 @@
<!-- Manage Space Rules --> <!-- Manage Space Rules -->
<action id="manage_space_rules"> <action id="manage_space_rules">
<permissions> <permissions>
<permission allow="true">CreateChildren</permission> <permission allow="true">ChangePermissions</permission>
</permissions> </permissions>
<label-id>manage_rules</label-id> <label-id>manage_rules</label-id>
<image>/images/icons/rule.gif</image> <image>/images/icons/rule.gif</image>

7
source/java/org/alfresco/web/bean/spaces/DeleteSpaceDialog.java
View File

@@ -86,7 +86,12 @@ public class DeleteSpaceDialog extends BaseDialogBean
if (DELETE_ALL.equals(this.deleteMode)) 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 else
{ {