From 802b1777cd6aa994acfdb9c320cd7a8f52903088 Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 25 Jun 2014 15:09:49 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud) 71587: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud) 70327: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3) 70241: MNT-10122: Merged DEV to V4.1-BUG-FIX (4.1.9) 63046: MNT-10122 Related to MNT-2234 - Incorrect workflow history when using jBPM - In JBPMEngine.getTaskProperties() was added ContentModel.PROP_CREATOR property. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repository/workflow/workflow.lib.ftl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow.lib.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow.lib.ftl index d01ee434f5..10c5ecd9e1 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow.lib.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/workflow/workflow.lib.ftl @@ -26,6 +26,17 @@ <#else> null, + "creator": + <#if task.creator??> + { + "userName": "${task.creator.userName}"<#if task.creator.firstName??>, + "firstName": "${task.creator.firstName}"<#if task.creator.lastName??>, + "lastName": "${task.creator.lastName}"<#if task.creator.avatar??>, + "avatar": "${task.creator.avatar}" + }, + <#else> + null, + "properties": <@propertiesJSON properties=task.properties />, "propertyLabels":