From aa7eeb5621123062606fb96bcb68f2e799d4e0cf Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Thu, 11 May 2017 11:41:24 +0300 Subject: [PATCH] RM-5012 - fix set explicit identifier on record and ftp upload --- .../org_alfresco_module_rm/record/RecordServiceImpl.java | 4 ---- .../module/org_alfresco_module_rm/record/RecordUtils.java | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java index b69af29123..6acd408d6e 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java @@ -486,10 +486,6 @@ public class RecordServiceImpl extends BaseBehaviourBean } } - // create and file the content as a record - file(nodeRef); - // recalculate disposition schedule for the record when linking it - dispositionService.recalculateNextDispositionStep(nodeRef); } } catch (RecordLinkRuntimeException e) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordUtils.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordUtils.java index c8fa357596..81c14e4048 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordUtils.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordUtils.java @@ -56,6 +56,11 @@ public class RecordUtils { mandatory("nodeService", nodeService); mandatory("nodeRef", nodeRef); + + if(nodeService.hasAspect(nodeRef, ContentModel.ASPECT_NO_CONTENT)) + { + return; + } // get the record id String recordId = (String) nodeService.getProperty(nodeRef, PROP_IDENTIFIER);