inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)

Browse Source 
124191 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
      124133 arebegea: MNT-14671 : Site with document locked for Edit Offline cannot be deleted
         - disabled the ASPECT_LOCKABLE when deleting a site
         - added tests for delete and restore site


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@124237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-03-18 13:00:05 +00:00
parent 45c9d15805
commit 0e2d8b083a
2 changed files with 284 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/site/SiteServiceImpl.java
View File

@@ -1628,6 +1628,7 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
//
// See ALF-7888 for some background on this issue
this.behaviourFilter.disableBehaviour(siteNodeRef, ContentModel.ASPECT_UNDELETABLE);
this.behaviourFilter.disableBehaviour(ContentModel.ASPECT_LOCKABLE);
NodeRef siteParent = getSiteParent(shortName);
this.behaviourFilter.disableBehaviour(siteParent, ContentModel.ASPECT_AUDITABLE);
@@ -1639,6 +1640,7 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
finally
{
this.behaviourFilter.enableBehaviour(siteNodeRef, ContentModel.ASPECT_UNDELETABLE);
this.behaviourFilter.enableBehaviour(ContentModel.ASPECT_LOCKABLE);
this.behaviourFilter.enableBehaviour(siteParent, ContentModel.ASPECT_AUDITABLE);
}