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

Fixed RM-940 Location of transfer isn't being set when transfer completed

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@55244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2013-09-11 16:12:02 +00:00
parent cf4c105fa1
commit 03d8b5053d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java
View File

@@ -54,11 +54,12 @@ public class TransferCompleteAction extends RMActionExecuterAbstractBase
if (this.dictionaryService.isSubClass(className, TYPE_TRANSFER) == true) if (this.dictionaryService.isSubClass(className, TYPE_TRANSFER) == true)
{ {
boolean accessionIndicator = ((Boolean)nodeService.getProperty(actionedUponNodeRef, PROP_TRANSFER_ACCESSION_INDICATOR)).booleanValue(); boolean accessionIndicator = ((Boolean)nodeService.getProperty(actionedUponNodeRef, PROP_TRANSFER_ACCESSION_INDICATOR)).booleanValue();
String transferLocation = nodeService.getProperty(actionedUponNodeRef, PROP_TRANSFER_LOCATION).toString();
List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs(actionedUponNodeRef, ASSOC_TRANSFERRED, RegexQNamePattern.MATCH_ALL); List<ChildAssociationRef> assocs = this.nodeService.getChildAssocs(actionedUponNodeRef, ASSOC_TRANSFERRED, RegexQNamePattern.MATCH_ALL);
for (ChildAssociationRef assoc : assocs) for (ChildAssociationRef assoc : assocs)
{ {
markComplete(assoc.getChildRef(), accessionIndicator); markComplete(assoc.getChildRef(), accessionIndicator, transferLocation);
} }
// Delete the transfer object // Delete the transfer object
@@ -85,7 +86,7 @@ public class TransferCompleteAction extends RMActionExecuterAbstractBase
* @param nodeRef * @param nodeRef
* disposition lifecycle node reference * disposition lifecycle node reference
*/ */
private void markComplete(NodeRef nodeRef, boolean accessionIndicator) private void markComplete(NodeRef nodeRef, boolean accessionIndicator, String transferLocation)
{ {
// Set the completed date // Set the completed date
DispositionAction da = dispositionService.getNextDispositionAction(nodeRef); DispositionAction da = dispositionService.getNextDispositionAction(nodeRef);
@@ -97,6 +98,7 @@ public class TransferCompleteAction extends RMActionExecuterAbstractBase
// Remove the transferring indicator aspect // Remove the transferring indicator aspect
nodeService.removeAspect(nodeRef, ASPECT_TRANSFERRING); nodeService.removeAspect(nodeRef, ASPECT_TRANSFERRING);
nodeService.setProperty(nodeRef, PROP_LOCATION, transferLocation);
// Determine which marker aspect to use // Determine which marker aspect to use
QName markerAspectQName = null; QName markerAspectQName = null;
@@ -117,6 +119,7 @@ public class TransferCompleteAction extends RMActionExecuterAbstractBase
for (NodeRef record : records) for (NodeRef record : records)
{ {
nodeService.addAspect(record, markerAspectQName, null); nodeService.addAspect(record, markerAspectQName, null);
nodeService.setProperty(record, PROP_LOCATION, transferLocation);
} }
} }