From d43668cd7612491e9992e795c06329ee7c2b05a1 Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Wed, 4 Feb 2015 14:29:36 +0000 Subject: [PATCH 1/2] RM-1871 : Merged revision(s) 94472 from /DEV/BUGFIXING/HEAD-2014_12_09 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@96064 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../transfer/TransferServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java index 784bc49b5c..027b9d9920 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java @@ -240,10 +240,16 @@ public class TransferServiceImpl extends ServiceBaseImpl List assocs = nodeService.getChildAssocs(nodeRef, ASSOC_TRANSFERRED, RegexQNamePattern.MATCH_ALL); for (ChildAssociationRef assoc : assocs) { - if (freezeService.hasFrozenChildren(assoc.getChildRef())) + if(freezeService.isFrozen(assoc.getChildRef())) { - throw new AlfrescoRuntimeException("Could not complete a transfer that contain frozen children."); + throw new AlfrescoRuntimeException("Could not complete a transfer that contains held folders"); } + + if(freezeService.hasFrozenChildren(assoc.getChildRef())) + { + throw new AlfrescoRuntimeException("Cound not complete a transfer that contains folders with held children"); + } + markComplete(assoc.getChildRef(), accessionIndicator, transferLocation); } From 82d87f99a123bab6f437899e0f4e588b14ce36c8 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Wed, 4 Feb 2015 18:04:29 +0000 Subject: [PATCH 2/2] RM-1892 (The file report action is not working for transferred folders and files in French) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@96123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org_alfresco_module_rm/messages/template_fr.properties | 2 +- .../org_alfresco_module_rm/messages/template_nl.properties | 2 +- .../org_alfresco_module_rm/messages/template_pt_BR.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_fr.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_fr.properties index 6d6454f936..991fc18261 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_fr.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_fr.properties @@ -1,6 +1,6 @@ # File Report Template file.report.acession.report=Rapport sur le versement \u00e0 un autre organisme -file.report.date.format=EEE MMM jj HH:mm:ss zzz yyyy +file.report.date.format=EEE MMM dd HH:mm:ss zzz yyyy file.report.declared.by=d\u00e9clar\u00e9 par file.report.declared.on=le file.report.destroyed=D\u00e9truit diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_nl.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_nl.properties index 8743a02e65..43a489c4a4 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_nl.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_nl.properties @@ -1,6 +1,6 @@ # File Report Template file.report.acession.report=Overdrachtsrapport -file.report.date.format=EEE MMM dd UU:mm:ss zzz jjjj +file.report.date.format=EEE MMM dd HH:mm:ss zzz yyyy file.report.declared.by=gedeclareerd door file.report.declared.on=op file.report.destroyed=Vernietigd diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_pt_BR.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_pt_BR.properties index 777e5fad25..c13c4e2edc 100644 --- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_pt_BR.properties +++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_pt_BR.properties @@ -1,6 +1,6 @@ # File Report Template file.report.acession.report=Relat\u00f3rio de ades\u00e3o -file.report.date.format=EEE MMM dd HH:mm:ss zzz aaaa +file.report.date.format=EEE MMM dd HH:mm:ss zzz yyyy file.report.declared.by=declarado por file.report.declared.on=em file.report.destroyed=Destru\u00eddos