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

ALF-10424: Add Task 'Message' text in workflow email notification

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2011-10-17 05:52:08 +00:00
parent fa0eab2852
commit a14c0107da
7 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/bootstrap/notification/wf-email.html.ftl
View File

@@ -60,6 +60,10 @@
<p><b>"${args.workflowTitle}"</b></p> <p><b>"${args.workflowTitle}"</b></p>
<#if (args.workflowDescription)??>
<p>${args.workflowDescription}</p>
</#if>
<p> <p>
<#if (args.workflowDueDate)??>Due:&nbsp;&nbsp;<b>${args.workflowDueDate?date?string.full}</b><br></#if> <#if (args.workflowDueDate)??>Due:&nbsp;&nbsp;<b>${args.workflowDueDate?date?string.full}</b><br></#if>
<#if (args.workflowPriority)??> <#if (args.workflowPriority)??>

4
config/alfresco/bootstrap/notification/wf-email.html_de.ftl
View File

@@ -60,6 +60,10 @@
<p><b>"${args.workflowTitle}"</b></p> <p><b>"${args.workflowTitle}"</b></p>
<#if (args.workflowDescription)??>
<p>${args.workflowDescription}</p>
</#if>
<p> <p>
<#if (args.workflowDueDate)??>Due:&nbsp;&nbsp;<b>${args.workflowDueDate?date?string.full}</b><br></#if> <#if (args.workflowDueDate)??>Due:&nbsp;&nbsp;<b>${args.workflowDueDate?date?string.full}</b><br></#if>
<#if (args.workflowPriority)??> <#if (args.workflowPriority)??>

4
config/alfresco/bootstrap/notification/wf-email.html_es.ftl
View File

@@ -60,6 +60,10 @@
<p><b>"${args.workflowTitle}"</b></p> <p><b>"${args.workflowTitle}"</b></p>
<#if (args.workflowDescription)??>
<p>${args.workflowDescription}</p>
</#if>
<p> <p>
<#if (args.workflowDueDate)??>Due:&nbsp;&nbsp;<b>${args.workflowDueDate?date?string.full}</b><br></#if> <#if (args.workflowDueDate)??>Due:&nbsp;&nbsp;<b>${args.workflowDueDate?date?string.full}</b><br></#if>
<#if (args.workflowPriority)??> <#if (args.workflowPriority)??>

4
config/alfresco/bootstrap/notification/wf-email.html_fr.ftl
View File

@@ -60,6 +60,10 @@
<p><b>"${args.workflowTitle}"</b></p> <p><b>"${args.workflowTitle}"</b></p>
<#if (args.workflowDescription)??>
<p>${args.workflowDescription}</p>
</#if>
<p> <p>
<#if (args.workflowDueDate)??>Due:&nbsp;&nbsp;<b>${args.workflowDueDate?date?string.full}</b><br></#if> <#if (args.workflowDueDate)??>Due:&nbsp;&nbsp;<b>${args.workflowDueDate?date?string.full}</b><br></#if>
<#if (args.workflowPriority)??> <#if (args.workflowPriority)??>

4
config/alfresco/bootstrap/notification/wf-email.html_it.ftl
View File

@@ -60,6 +60,10 @@
<p><b>"${args.workflowTitle}"</b></p> <p><b>"${args.workflowTitle}"</b></p>
<#if (args.workflowDescription)??>
<p>${args.workflowDescription}</p>
</#if>
<p> <p>
<#if (args.workflowDueDate)??>Due:&nbsp;&nbsp;<b>${args.workflowDueDate?date?string.full}</b><br></#if> <#if (args.workflowDueDate)??>Due:&nbsp;&nbsp;<b>${args.workflowDueDate?date?string.full}</b><br></#if>
<#if (args.workflowPriority)??> <#if (args.workflowPriority)??>

4
config/alfresco/bootstrap/notification/wf-email.html_ja.ftl
View File

@@ -60,6 +60,10 @@
<p><b>"${args.workflowTitle}"</b></p> <p><b>"${args.workflowTitle}"</b></p>
<#if (args.workflowDescription)??>
<p>${args.workflowDescription}</p>
</#if>
<p> <p>
<#if (args.workflowDueDate)??>Due:&nbsp;&nbsp;<b>${args.workflowDueDate?date?string.full}</b><br></#if> <#if (args.workflowDueDate)??>Due:&nbsp;&nbsp;<b>${args.workflowDueDate?date?string.full}</b><br></#if>
<#if (args.workflowPriority)??> <#if (args.workflowPriority)??>

4
source/java/org/alfresco/repo/workflow/WorkflowNotificationUtils.java
View File

@@ -173,10 +173,6 @@ public abstract class WorkflowNotificationUtils
// Get the title and description // Get the title and description
String title = workflowTask.getTitle(); String title = workflowTask.getTitle();
String description = (String)props.get(WorkflowModel.PROP_DESCRIPTION); String description = (String)props.get(WorkflowModel.PROP_DESCRIPTION);
if (description == null)
{
description = workflowTask.getDescription();
}
// Get the duedate, priority and workflow package // Get the duedate, priority and workflow package
Date dueDate = (Date)props.get(WorkflowModel.PROP_DUE_DATE); Date dueDate = (Date)props.get(WorkflowModel.PROP_DUE_DATE);