From fedc2d2823fc6ae121a59eb2cf3926722c9ba54f Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Thu, 5 Sep 2013 06:57:54 +0000 Subject: [PATCH] RM-689: Unclear work of outbound (delete) rules git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@54959 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org_alfresco_module_rm/action/impl/FileToAction.java | 6 ------ .../org_alfresco_module_rm/action/impl/RejectAction.java | 6 +++++- .../action/impl/RequestInfoAction.java | 4 +++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java index 39d0ceec14..ac7132d962 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FileToAction.java @@ -91,8 +91,6 @@ public class FileToAction extends RMActionExecuterAbstractBase if (recordsManagementService.isRecordFolder(recordFolder) == true) { - // TODO .. what if a record of the same name already exists in the destination record folder?? - final NodeRef finalRecordFolder = recordFolder; try { @@ -108,10 +106,6 @@ public class FileToAction extends RMActionExecuterAbstractBase throw new AlfrescoRuntimeException("Unable to execute file to action, becuase the destination was not a record folder."); } } - else - { - throw new AlfrescoRuntimeException("Unable to execute file to action, because the actioned upon node is not an unfiled record."); - } } } diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RejectAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RejectAction.java index 18efcd338d..0dba20309d 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RejectAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RejectAction.java @@ -47,7 +47,11 @@ public class RejectAction extends RMActionExecuterAbstractBase @Override protected void executeImpl(Action action, NodeRef actionedUponNodeRef) { - recordService.rejectRecord(actionedUponNodeRef, (String) action.getParameterValue(PARAM_REASON)); + if (nodeService.exists(actionedUponNodeRef) == true && + nodeService.getProperty(actionedUponNodeRef, PROP_RECORD_ORIGINATING_LOCATION) != null) + { + recordService.rejectRecord(actionedUponNodeRef, (String) action.getParameterValue(PARAM_REASON)); + } } /** diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java index dd0ac26da3..f8f28bacd9 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase; import org.alfresco.repo.action.ParameterDefinitionImpl; import org.alfresco.repo.workflow.WorkflowModel; @@ -78,7 +79,8 @@ public class RequestInfoAction extends RMActionExecuterAbstractBase @Override protected void executeImpl(Action action, NodeRef actionedUponNodeRef) { - if (recordService.isRecord(actionedUponNodeRef) == true) + if (recordService.isRecord(actionedUponNodeRef) == true && + nodeService.hasAspect(actionedUponNodeRef, ContentModel.ASPECT_PENDING_DELETE) == false) { String workflowDefinitionId = workflowService.getDefinitionByName(REQUEST_INFO_WORKFLOW_DEFINITION_NAME).getId(); Map parameters = new HashMap();