From c74100a1fafcd2e15e30a991768aed24ebb6670f Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 16 May 2014 16:33:44 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 68534: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud) 68311: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3) 68270: MNT-11347: Merged V4.1.4 (4.1.4.28) to V4.1-BUG-FIX (4.1.9) 66989: MNT-11026 Version indicators after publishing a document are incorrect. - In PublishingEventHelper#createPublishSnapshot(NodeRef) was added versionProperties map. 67468: MNT-11026 Version indicators after publishing a document are incorrect. - In PublishingEventHelper#createPublishSnapshot(NodeRef) was addedversionService.ensureVersioningEnabled(node, props). git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70413 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/publishing/PublishingEventHelper.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/source/java/org/alfresco/repo/publishing/PublishingEventHelper.java b/source/java/org/alfresco/repo/publishing/PublishingEventHelper.java index c1d69ced83..cf2c07f4de 100644 --- a/source/java/org/alfresco/repo/publishing/PublishingEventHelper.java +++ b/source/java/org/alfresco/repo/publishing/PublishingEventHelper.java @@ -64,6 +64,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.permissions.AccessDeniedException; import org.alfresco.repo.transfer.manifest.TransferManifestNodeFactory; import org.alfresco.repo.transfer.manifest.TransferManifestNormalNode; +import org.alfresco.repo.version.VersionModel; import org.alfresco.repo.workflow.WorkflowModel; import org.alfresco.service.cmr.publishing.NodeSnapshot; import org.alfresco.service.cmr.publishing.PublishingDetails; @@ -84,6 +85,7 @@ import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.transfer.TransferDefinition; import org.alfresco.service.cmr.version.VersionService; +import org.alfresco.service.cmr.version.VersionType; import org.alfresco.service.cmr.workflow.WorkflowDefinition; import org.alfresco.service.cmr.workflow.WorkflowPath; import org.alfresco.service.cmr.workflow.WorkflowService; @@ -562,6 +564,13 @@ public class PublishingEventHelper private NodeSnapshotTransferImpl createPublishSnapshot(NodeRef node) { + if (!nodeService.hasAspect(node, ContentModel.ASPECT_VERSIONABLE)) + { + Map props = new HashMap(1, 1.0f); + props.put(ContentModel.PROP_AUTO_VERSION, true); + props.put(ContentModel.PROP_AUTO_VERSION_PROPS, false); + versionService.ensureVersioningEnabled(node, props); + } versionService.createVersion(node, null); TransferManifestNormalNode payload = (TransferManifestNormalNode) transferManifestNodeFactory.createTransferManifestNode(node, excludedAspectsTransferDefinition); NodeSnapshotTransferImpl snapshot = new NodeSnapshotTransferImpl(payload);