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

RM-631:

Browse Source 
* 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
This commit is contained in:
Tuna Aksoy
2013-04-11 16:18:50 +00:00
parent 850a2e9b00
commit 92b3afbe7f
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RequestInfoAction.java
View File

@@ -36,6 +36,8 @@ import org.alfresco.service.cmr.workflow.WorkflowService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.workflow.RMWorkflowModel; import org.alfresco.workflow.RMWorkflowModel;
import org.apache.axis.utils.StringUtils; 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 * 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 public class RequestInfoAction extends RMActionExecuterAbstractBase
{ {
/** Logger */
private static Log logger = LogFactory.getLog(RequestInfoAction.class);
/** Parameter names */ /** Parameter names */
public static final String PARAM_REQUESTED_INFO = "requestedInfo"; public static final String PARAM_REQUESTED_INFO = "requestedInfo";
public static final String PARAM_ASSIGNEES = "assignees"; public static final String PARAM_ASSIGNEES = "assignees";
@@ -73,15 +78,22 @@ public class RequestInfoAction extends RMActionExecuterAbstractBase
@Override @Override
protected void executeImpl(Action action, NodeRef actionedUponNodeRef) protected void executeImpl(Action action, NodeRef actionedUponNodeRef)
{ {
String workflowDefinitionId = workflowService.getDefinitionByName(REQUEST_INFO_WORKFLOW_DEFINITION_NAME).getId(); if (recordService.isRecord(actionedUponNodeRef) == true)
Map<QName, Serializable> parameters = new HashMap<QName, Serializable>(); {
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(WorkflowModel.ASSOC_PACKAGE, getWorkflowPackage(action, actionedUponNodeRef));
parameters.put(RMWorkflowModel.RM_MIXED_ASSIGNEES, getAssignees(action)); parameters.put(RMWorkflowModel.RM_MIXED_ASSIGNEES, getAssignees(action));
parameters.put(RMWorkflowModel.RM_REQUESTED_INFORMATION, getRequestedInformation(action)); parameters.put(RMWorkflowModel.RM_REQUESTED_INFORMATION, getRequestedInformation(action));
parameters.put(RMWorkflowModel.RM_RULE_CREATOR, getRuleCreator(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." );
}
} }
/** /**

4
rm-server/source/java/org/alfresco/workflow/requestInfo/RequestInfoNotifier.java
View File

@@ -54,6 +54,9 @@ public class RequestInfoNotifier implements TaskListener
String initiator = RequestInfoUtils.getInitiator(delegateTask); String initiator = RequestInfoUtils.getInitiator(delegateTask);
delegateTask.setAssignee(initiator); 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 // Create the context and send an email to the initiator
NotificationContext notificationContext = new NotificationContext(); NotificationContext notificationContext = new NotificationContext();
notificationContext.setAsyncNotification(true); notificationContext.setAsyncNotification(true);
@@ -64,6 +67,7 @@ public class RequestInfoNotifier implements TaskListener
// Send the email // Send the email
RequestInfoUtils.getServiceRegistry().getNotificationService().sendNotification(EMailNotificationProvider.NAME, notificationContext); RequestInfoUtils.getServiceRegistry().getNotificationService().sendNotification(EMailNotificationProvider.NAME, notificationContext);
*/
} }
/** /**