From 03d8b5053d779a26ccdabf860bf2afabb05ad023 Mon Sep 17 00:00:00 2001 From: Gethin James Date: Wed, 11 Sep 2013 16:12:02 +0000 Subject: [PATCH] Fixed RM-940 Location of transfer isn't being set when transfer completed git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@55244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../action/impl/TransferCompleteAction.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java index a86c779338..ddbf9b0975 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java @@ -54,11 +54,12 @@ public class TransferCompleteAction extends RMActionExecuterAbstractBase if (this.dictionaryService.isSubClass(className, TYPE_TRANSFER) == true) { boolean accessionIndicator = ((Boolean)nodeService.getProperty(actionedUponNodeRef, PROP_TRANSFER_ACCESSION_INDICATOR)).booleanValue(); + String transferLocation = nodeService.getProperty(actionedUponNodeRef, PROP_TRANSFER_LOCATION).toString(); List assocs = this.nodeService.getChildAssocs(actionedUponNodeRef, ASSOC_TRANSFERRED, RegexQNamePattern.MATCH_ALL); for (ChildAssociationRef assoc : assocs) { - markComplete(assoc.getChildRef(), accessionIndicator); + markComplete(assoc.getChildRef(), accessionIndicator, transferLocation); } // Delete the transfer object @@ -85,7 +86,7 @@ public class TransferCompleteAction extends RMActionExecuterAbstractBase * @param nodeRef * disposition lifecycle node reference */ - private void markComplete(NodeRef nodeRef, boolean accessionIndicator) + private void markComplete(NodeRef nodeRef, boolean accessionIndicator, String transferLocation) { // Set the completed date DispositionAction da = dispositionService.getNextDispositionAction(nodeRef); @@ -97,6 +98,7 @@ public class TransferCompleteAction extends RMActionExecuterAbstractBase // Remove the transferring indicator aspect nodeService.removeAspect(nodeRef, ASPECT_TRANSFERRING); + nodeService.setProperty(nodeRef, PROP_LOCATION, transferLocation); // Determine which marker aspect to use QName markerAspectQName = null; @@ -117,6 +119,7 @@ public class TransferCompleteAction extends RMActionExecuterAbstractBase for (NodeRef record : records) { nodeService.addAspect(record, markerAspectQName, null); + nodeService.setProperty(record, PROP_LOCATION, transferLocation); } }