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 V3.3 to HEAD

Browse Source 
20225: Merged V3.2.1 to V3.3 
      20224: Fix for ALF-2787 - items deleted by non-admin users now correctly archived.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2010-06-03 09:35:41 +00:00
parent 29595e15d6
commit 52212fc5cd
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,6 +86,7 @@ public class DeleteSpaceDialog extends BaseDialogBean
protected String finishImpl(FacesContext context, String outcome)
throws Exception
{
final boolean isAdmin = this.navigator.getCurrentUser().isAdmin();
// get the space to delete
Node node = this.browseBean.getActionSpace();
if (node != null)
@@ -98,7 +99,7 @@ public class DeleteSpaceDialog extends BaseDialogBean
try
{
if (!this.executeRules)
if (isAdmin && !this.executeRules)
{
Repository.getServiceRegistry(context).getRuleService().disableRules();
}
@@ -108,7 +109,7 @@ public class DeleteSpaceDialog extends BaseDialogBean
// Check the node still exists
if (this.getNodeService().exists(nodeRef))
{
if (!this.archiveNodes)
if (isAdmin && !this.archiveNodes)
{
this.getNodeService().addAspect(node.getNodeRef(), ContentModel.ASPECT_TEMPORARY, null);
}
@@ -173,7 +174,7 @@ public class DeleteSpaceDialog extends BaseDialogBean
tx = txService.getNonPropagatingUserTransaction();
tx.begin();
if (!this.archiveNodes)
if (isAdmin && !this.archiveNodes)
{
this.getNodeService().addAspect(nodeRef, ContentModel.ASPECT_TEMPORARY, null);
}
@@ -190,7 +191,7 @@ public class DeleteSpaceDialog extends BaseDialogBean
}
finally
{
if (!this.executeRules)
if (isAdmin && !this.executeRules)
{
Repository.getServiceRegistry(context).getRuleService().enableRules();
}