From a14c0107da06fee2bbcbd6e87d069f73b1c668c5 Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Mon, 17 Oct 2011 05:52:08 +0000 Subject: [PATCH] ALF-10424: Add Task 'Message' text in workflow email notification git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/bootstrap/notification/wf-email.html.ftl | 4 ++++ config/alfresco/bootstrap/notification/wf-email.html_de.ftl | 4 ++++ config/alfresco/bootstrap/notification/wf-email.html_es.ftl | 4 ++++ config/alfresco/bootstrap/notification/wf-email.html_fr.ftl | 4 ++++ config/alfresco/bootstrap/notification/wf-email.html_it.ftl | 4 ++++ config/alfresco/bootstrap/notification/wf-email.html_ja.ftl | 4 ++++ .../alfresco/repo/workflow/WorkflowNotificationUtils.java | 6 +----- 7 files changed, 25 insertions(+), 5 deletions(-) diff --git a/config/alfresco/bootstrap/notification/wf-email.html.ftl b/config/alfresco/bootstrap/notification/wf-email.html.ftl index 11a7cd8659..89c48106df 100644 --- a/config/alfresco/bootstrap/notification/wf-email.html.ftl +++ b/config/alfresco/bootstrap/notification/wf-email.html.ftl @@ -60,6 +60,10 @@

"${args.workflowTitle}"

+ <#if (args.workflowDescription)??> +

${args.workflowDescription}

+ +

<#if (args.workflowDueDate)??>Due:  ${args.workflowDueDate?date?string.full}
<#if (args.workflowPriority)??> diff --git a/config/alfresco/bootstrap/notification/wf-email.html_de.ftl b/config/alfresco/bootstrap/notification/wf-email.html_de.ftl index 3f493bd196..be399b66fd 100644 --- a/config/alfresco/bootstrap/notification/wf-email.html_de.ftl +++ b/config/alfresco/bootstrap/notification/wf-email.html_de.ftl @@ -60,6 +60,10 @@

"${args.workflowTitle}"

+ <#if (args.workflowDescription)??> +

${args.workflowDescription}

+ +

<#if (args.workflowDueDate)??>Due:  ${args.workflowDueDate?date?string.full}
<#if (args.workflowPriority)??> diff --git a/config/alfresco/bootstrap/notification/wf-email.html_es.ftl b/config/alfresco/bootstrap/notification/wf-email.html_es.ftl index 09bddf6a00..bd346d1951 100644 --- a/config/alfresco/bootstrap/notification/wf-email.html_es.ftl +++ b/config/alfresco/bootstrap/notification/wf-email.html_es.ftl @@ -60,6 +60,10 @@

"${args.workflowTitle}"

+ <#if (args.workflowDescription)??> +

${args.workflowDescription}

+ +

<#if (args.workflowDueDate)??>Due:  ${args.workflowDueDate?date?string.full}
<#if (args.workflowPriority)??> diff --git a/config/alfresco/bootstrap/notification/wf-email.html_fr.ftl b/config/alfresco/bootstrap/notification/wf-email.html_fr.ftl index e7f20f2d3c..550931b4f9 100644 --- a/config/alfresco/bootstrap/notification/wf-email.html_fr.ftl +++ b/config/alfresco/bootstrap/notification/wf-email.html_fr.ftl @@ -60,6 +60,10 @@

"${args.workflowTitle}"

+ <#if (args.workflowDescription)??> +

${args.workflowDescription}

+ +

<#if (args.workflowDueDate)??>Due:  ${args.workflowDueDate?date?string.full}
<#if (args.workflowPriority)??> diff --git a/config/alfresco/bootstrap/notification/wf-email.html_it.ftl b/config/alfresco/bootstrap/notification/wf-email.html_it.ftl index 54a22353d4..f4bb726ac1 100644 --- a/config/alfresco/bootstrap/notification/wf-email.html_it.ftl +++ b/config/alfresco/bootstrap/notification/wf-email.html_it.ftl @@ -60,6 +60,10 @@

"${args.workflowTitle}"

+ <#if (args.workflowDescription)??> +

${args.workflowDescription}

+ +

<#if (args.workflowDueDate)??>Due:  ${args.workflowDueDate?date?string.full}
<#if (args.workflowPriority)??> diff --git a/config/alfresco/bootstrap/notification/wf-email.html_ja.ftl b/config/alfresco/bootstrap/notification/wf-email.html_ja.ftl index cd7e520745..863849f051 100644 --- a/config/alfresco/bootstrap/notification/wf-email.html_ja.ftl +++ b/config/alfresco/bootstrap/notification/wf-email.html_ja.ftl @@ -60,6 +60,10 @@

"${args.workflowTitle}"

+ <#if (args.workflowDescription)??> +

${args.workflowDescription}

+ +

<#if (args.workflowDueDate)??>Due:  ${args.workflowDueDate?date?string.full}
<#if (args.workflowPriority)??> diff --git a/source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java b/source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java index 80403238cd..8991edc658 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java @@ -172,11 +172,7 @@ public abstract class WorkflowNotificationUtils // Get the title and description String title = workflowTask.getTitle(); - String description = (String)props.get(WorkflowModel.PROP_DESCRIPTION); - if (description == null) - { - description = workflowTask.getDescription(); - } + String description = (String)props.get(WorkflowModel.PROP_DESCRIPTION); // Get the duedate, priority and workflow package Date dueDate = (Date)props.get(WorkflowModel.PROP_DUE_DATE);