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

Merged 5.1.N (5.1.1) to HEAD (5.2)

Browse Source 
122488 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      122474 rneamtu: Merged DEV to 5.0.N (5.0.4)
         122425 rneamtu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
            - fixed cancel editing and delete failures


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123669 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-03-11 22:27:02 +00:00
parent 63501315b7
commit 03c9eaeb9f
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java
View File

@@ -719,6 +719,7 @@ public class CheckOutCheckInServiceImpl implements CheckOutCheckInService,Extens
behaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
behaviourFilter.disableBehaviour(workingCopyNodeRef, ContentModel.ASPECT_WORKING_COPY);
behaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_CMIS_CREATED_CHECKEDOUT);
try
{
if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_LOCKABLE))
@@ -746,6 +747,7 @@ public class CheckOutCheckInServiceImpl implements CheckOutCheckInService,Extens
finally
{
behaviourFilter.enableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);
behaviourFilter.enableBehaviour(nodeRef, ContentModel.ASPECT_CMIS_CREATED_CHECKEDOUT);
}
return nodeRef;