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

RM-2194: Review feedback

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@120140 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2015-12-14 22:09:52 +00:00
parent c57c0ed25f
commit a495c73d57
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
View File

@@ -73,7 +73,7 @@ rm.completerecord.mandatorypropertiescheck.enabled=true
rm.patch.v22.convertToStandardFilePlan=false rm.patch.v22.convertToStandardFilePlan=false
# #
# Extended auto-version behaviour. If true and other auto-version properties are satisified, then # Extended auto-version behaviour. If true and other auto-version properties are satisfied, then
# a document will be auto-versioned when it's type is changed. # a document will be auto-versioned when its type is changed.
# #
version.store.enableAutoVersionOnTypeChange=false version.store.enableAutoVersionOnTypeChange=false

8
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java
View File

@@ -142,13 +142,13 @@ public class ExtendedVersionableAspect implements NodeServicePolicies.OnSetNodeT
public void onSetNodeType(NodeRef nodeRef, QName oldType, QName newType) public void onSetNodeType(NodeRef nodeRef, QName oldType, QName newType)
{ {
if (isAutoVersionOnTypeChange && if (isAutoVersionOnTypeChange &&
nodeService.exists(nodeRef) == true && nodeService.exists(nodeRef) &&
!LockUtils.isLockedAndReadOnly(nodeRef, lockService) && !LockUtils.isLockedAndReadOnly(nodeRef, lockService) &&
nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE) == true && nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE) &&
nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY) == false) !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY))
{ {
Map<NodeRef, NodeRef> versionedNodeRefs = (Map)alfrescoTransactionSupport.getResource(KEY_VERSIONED_NODEREFS); Map<NodeRef, NodeRef> versionedNodeRefs = (Map)alfrescoTransactionSupport.getResource(KEY_VERSIONED_NODEREFS);
if (versionedNodeRefs == null || versionedNodeRefs.containsKey(nodeRef) == false) if (versionedNodeRefs == null || !versionedNodeRefs.containsKey(nodeRef))
{ {
// Determine whether the node is auto versionable (for content updates) or not // Determine whether the node is auto versionable (for content updates) or not
boolean autoVersion = false; boolean autoVersion = false;