From 35de5d1ff17372125ecd0b04b9ff2844a71e39e3 Mon Sep 17 00:00:00 2001
From: Frederik Heremans <frederik.heremans@alfresco.com>
Date: Tue, 8 Oct 2013 18:57:43 +0000
Subject: [PATCH] ALF-20240: Fixed issue with non-localized task title in
 notification email

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56401 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/workflow/WorkflowNotificationUtils.java      |  4 ++--
 .../alfresco/repo/workflow/WorkflowServiceImpl.java   |  5 +----
 .../activiti/tasklistener/TaskCreateListener.java     | 11 ++++-------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java b/source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java
index 310eff699f..f09d01e9ec 100644
--- a/source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java
+++ b/source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java
@@ -101,7 +101,7 @@ public class WorkflowNotificationUtils
      */
     public void sendWorkflowAssignedNotificationEMail(
             String taskId,
-            String taskType,
+            String taskTitle,
             String description,
             Date dueDate,
             Integer priority,
@@ -129,7 +129,7 @@ public class WorkflowNotificationUtils
         // Build the template args
         Map<String, Serializable>templateArgs = new HashMap<String, Serializable>(7);
         templateArgs.put(ARG_WF_ID, taskId);
-        templateArgs.put(ARG_WF_TITLE, taskType);
+        templateArgs.put(ARG_WF_TITLE, taskTitle);
         templateArgs.put(ARG_WF_DESCRIPTION, description);
         if (dueDate != null)
         {
diff --git a/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java b/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
index 7b47c9cab6..e1c6afba3b 100644
--- a/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
+++ b/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
@@ -34,7 +34,6 @@ import java.util.Set;
 import org.alfresco.model.ContentModel;
 import org.alfresco.model.WCMModel;
 import org.alfresco.repo.avm.AVMNodeConverter;
-import org.alfresco.repo.workflow.jbpm.JBPMEngine;
 import org.alfresco.service.cmr.avmsync.AVMDifference;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
@@ -978,13 +977,11 @@ public class WorkflowServiceImpl implements WorkflowService
                         {
                             workflowDefId = workflowDefId.substring(workflowDefId.indexOf('$') + 1);
                         }
-                        String taskDefId = task.getDefinition().getId().replace(":", "_");
-                        String taskType = workflowDefId + "." + (engineId.equals(JBPMEngine.ENGINE_ID) ? "type" : "task") + "." + taskDefId;
                         
                         // Send the notification
                         workflowNotificationUtils.sendWorkflowAssignedNotificationEMail(
                                     taskId,
-                                    taskType,
+                                    null,
                                     assignee,
                                     false);
                     }
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 33c8633f83..cb198563be 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCreateListener.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/tasklistener/TaskCreateListener.java
@@ -129,22 +129,19 @@ public class TaskCreateListener implements TaskListener
             }
             
             String title;
-            if (taskFormKey != null)
+            if (task.getName() != null)
             {
-                title = taskFormKey.replace(":", "_");
+                title = task.getName();
             }
             else
             {
-                title = task.getName().replaceAll(" ", "_");
+                title = taskFormKey.replace(":", "_");
             }
 
             // Send email notification
-            String workflowDefId = task.getProcessDefinitionId().split(":")[0];
-            String taskType = workflowDefId + ".task." + title + ".title";
-            
             workflowNotificationUtils.sendWorkflowAssignedNotificationEMail(
                     ActivitiConstants.ENGINE_ID + "$" + task.getId(),
-                    taskType,
+                    title,
                     task.getDescription(),
                     task.getDueDate(),
                     Integer.valueOf(task.getPriority()),