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> +
<#if (args.workflowDueDate)??>Due: ${args.workflowDueDate?date?string.full}
#if>
<#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> +
<#if (args.workflowDueDate)??>Due: ${args.workflowDueDate?date?string.full}
#if>
<#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> +
<#if (args.workflowDueDate)??>Due: ${args.workflowDueDate?date?string.full}
#if>
<#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> +
<#if (args.workflowDueDate)??>Due: ${args.workflowDueDate?date?string.full}
#if>
<#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> +
<#if (args.workflowDueDate)??>Due: ${args.workflowDueDate?date?string.full}
#if>
<#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> +
<#if (args.workflowDueDate)??>Due: ${args.workflowDueDate?date?string.full}
#if>
<#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);