From 92b3afbe7f0b279524f1fa3f52bc1416a7cbe59d Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Thu, 11 Apr 2013 16:18:50 +0000
Subject: [PATCH] RM-631:  * A request info rule should not start a workflow
 for a record folder  * Sending email after providing the requested info has
 been disabled

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@49123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../action/impl/RequestInfoAction.java        | 26 ++++++++++++++-----
 .../requestInfo/RequestInfoNotifier.java      |  4 +++
 2 files changed, 23 insertions(+), 7 deletions(-)

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 c9630991bb..dd0ac26da3 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
@@ -36,6 +36,8 @@ import org.alfresco.service.cmr.workflow.WorkflowService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.workflow.RMWorkflowModel;
 import org.apache.axis.utils.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Request info action for starting a workflow to request more information for an undeclared record
@@ -45,6 +47,9 @@ import org.apache.axis.utils.StringUtils;
  */
 public class RequestInfoAction extends RMActionExecuterAbstractBase
 {
+    /** Logger */
+    private static Log logger = LogFactory.getLog(RequestInfoAction.class);
+
     /** Parameter names */
     public static final String PARAM_REQUESTED_INFO = "requestedInfo";
     public static final String PARAM_ASSIGNEES = "assignees";
@@ -73,15 +78,22 @@ public class RequestInfoAction extends RMActionExecuterAbstractBase
     @Override
     protected void executeImpl(Action action, NodeRef actionedUponNodeRef)
     {
-        String workflowDefinitionId = workflowService.getDefinitionByName(REQUEST_INFO_WORKFLOW_DEFINITION_NAME).getId();
-        Map<QName, Serializable> parameters = new HashMap<QName, Serializable>();
+        if (recordService.isRecord(actionedUponNodeRef) == true)
+        {
+            String workflowDefinitionId = workflowService.getDefinitionByName(REQUEST_INFO_WORKFLOW_DEFINITION_NAME).getId();
+            Map<QName, Serializable> parameters = new HashMap<QName, Serializable>();
 
-        parameters.put(WorkflowModel.ASSOC_PACKAGE, getWorkflowPackage(action, actionedUponNodeRef));
-        parameters.put(RMWorkflowModel.RM_MIXED_ASSIGNEES, getAssignees(action));
-        parameters.put(RMWorkflowModel.RM_REQUESTED_INFORMATION, getRequestedInformation(action));
-        parameters.put(RMWorkflowModel.RM_RULE_CREATOR, getRuleCreator(action));
+            parameters.put(WorkflowModel.ASSOC_PACKAGE, getWorkflowPackage(action, actionedUponNodeRef));
+            parameters.put(RMWorkflowModel.RM_MIXED_ASSIGNEES, getAssignees(action));
+            parameters.put(RMWorkflowModel.RM_REQUESTED_INFORMATION, getRequestedInformation(action));
+            parameters.put(RMWorkflowModel.RM_RULE_CREATOR, getRuleCreator(action));
 
-        workflowService.startWorkflow(workflowDefinitionId, parameters);
+            workflowService.startWorkflow(workflowDefinitionId, parameters);
+        }
+        else
+        {
+            logger.info("The node '" + actionedUponNodeRef.toString() + "' is not a record so a workflow will not be started for it." );
+        }
     }
 
     /**
diff --git a/rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoNotifier.java b/rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoNotifier.java
index 4e7c575b85..ffe4df3b77 100644
--- a/rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoNotifier.java
+++ b/rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoNotifier.java
@@ -54,6 +54,9 @@ public class RequestInfoNotifier implements TaskListener
         String initiator = RequestInfoUtils.getInitiator(delegateTask);
         delegateTask.setAssignee(initiator);
 
+        // FIXME: Is sending an email required?
+        // At the moment we do not use email templates
+        /*
         // Create the context and send an email to the initiator
         NotificationContext notificationContext = new NotificationContext();
         notificationContext.setAsyncNotification(true);
@@ -64,6 +67,7 @@ public class RequestInfoNotifier implements TaskListener
 
         // Send the email
         RequestInfoUtils.getServiceRegistry().getNotificationService().sendNotification(EMailNotificationProvider.NAME, notificationContext);
+        */
     }
 
     /**