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

Reverse Merge HEAD (4.3/Cloud)

Browse Source 
65769: Merged DEV to HEAD (4.3)
      65652 : ACE-1131 :  Cmisaction:deleteContent: Inconsistency in versioning behaviour for documents created via Cmis and Share
         - Set versionable aspect properties to default values when applying versionable state via CMIS


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@65984 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-03-31 17:39:34 +00:00
parent 354ba7b12e
commit e069af2971
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/opencmis/CMISConnector.java
View File

@@ -1369,7 +1369,10 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
{
if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE))
{
nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, null);
Map<QName, Serializable> props = new HashMap<QName, Serializable>();
props.put(ContentModel.PROP_INITIAL_VERSION, false);
props.put(ContentModel.PROP_AUTO_VERSION, false);
nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, props);
}
Map<String, Serializable> versionProperties = new HashMap<String, Serializable>(5);
@@ -1382,7 +1385,10 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
{
if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE))
{
nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, null);
Map<QName, Serializable> props = new HashMap<QName, Serializable>();
props.put(ContentModel.PROP_INITIAL_VERSION, false);
props.put(ContentModel.PROP_AUTO_VERSION, false);
nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, props);
}
Map<String, Serializable> versionProperties = new HashMap<String, Serializable>(5);