From 2e1ace4604ed80b336132d5d93bf8a24b2ec0778 Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Mon, 15 Aug 2011 15:57:22 +0000
Subject: [PATCH] Workflow Email Notification updates: - Added
 email-notification control for use in "Start Workflow" forms, it's
 essentially a copy of the checkbox control but defaults to checked i.e. it
 ignore the field.value - Updated form config to use new custom
 email-notification control - Updated form config so 'Send Email
 Notifications' setting is shown on workflow summary page and start task forms
 - Set the 'pooled' flag for Activiti tasks when sending notification

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29769 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/messages/bpm-messages.properties           | 4 ++--
 config/alfresco/model/bpmModel.xml                         | 2 +-
 .../workflow/activiti/tasklistener/TaskCreateListener.java | 7 ++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/config/alfresco/messages/bpm-messages.properties b/config/alfresco/messages/bpm-messages.properties
index cea1f41baa..5ab43430a4 100644
--- a/config/alfresco/messages/bpm-messages.properties
+++ b/config/alfresco/messages/bpm-messages.properties
@@ -62,8 +62,8 @@ bpm_businessprocessmodel.property.bpm_workflowDueDate.title=Workflow Due Date
 bpm_businessprocessmodel.property.bpm_workflowDueDate.description=Workflow Due Date
 bpm_businessprocessmodel.property.bpm_workflowPriority.title=Workflow Priority
 bpm_businessprocessmodel.property.bpm_workflowPriority.description=Workflow Priority
-bpm_businessprocessmodel.property.bpm_sendEMailNotifications.title=Send EMail Notifications
-bpm_businessprocessmodel.property.bpm_sendEMailNotifications.description=Send EMail Notifications
+bpm_businessprocessmodel.property.bpm_sendEMailNotifications.title=Send Email Notifications
+bpm_businessprocessmodel.property.bpm_sendEMailNotifications.description=Send Email Notifications
 bpm_businessprocessmodel.association.bpm_assignee.title=Workflow Assignee
 bpm_businessprocessmodel.association.bpm_assignee.description=Workflow Assignee
 bpm_businessprocessmodel.association.bpm_assignees.title=Workflow Assignees
diff --git a/config/alfresco/model/bpmModel.xml b/config/alfresco/model/bpmModel.xml
index 0dad23ad7f..1104cf8941 100644
--- a/config/alfresco/model/bpmModel.xml
+++ b/config/alfresco/model/bpmModel.xml
@@ -307,7 +307,7 @@
 
                 <!--  Priority for the workflow as a whole -->
                 <property name="bpm:workflowPriority">
-                    <type>d:int</type>RW
+                    <type>d:int</type>
                     <default>2</default>
                     <constraints>
                         <constraint ref="bpm:allowedPriority" />
diff --git a/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCreateListener.java b/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCreateListener.java
index 70e8734831..b3939fcafc 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCreateListener.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCreateListener.java
@@ -80,20 +80,17 @@ public class TaskCreateListener implements TaskListener
                 workflowPackage = scriptNode.getNodeRef();
             }
             
-            // TODO how do we identify a pooled task?
-            boolean pooled = false;
-            
             // Send email notification
             WorkflowNotificationUtils.sendWorkflowAssignedNotificationEMail(
                     services,
-                    "activiti$" + task.getId(),
+                    ActivitiConstants.ENGINE_ID + "$" + task.getId(),
                     task.getName(),
                     task.getDescription(),
                     task.getDueDate(),
                     Integer.valueOf(task.getPriority()),
                     workflowPackage,
                     new String[]{task.getAssignee()},
-                    pooled);
+                    (task.getAssignee() == null));
         }
     }