Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

83530: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      81658: Merge DEV to V4.2-BUG-FIX
       81644 : MNT-11775 : The (reject) review comment value is never shown in a moderated site rejection email.
        Fixed some code for getting correct rejection email. Added unit test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-09-18 17:08:41 +00:00
parent fb59c6968e
commit 7426972237
2 changed files with 74 additions and 1 deletions

View File

@@ -28,6 +28,7 @@
<activiti:field name="script">
<activiti:string>
execution.setVariable('imwf_reviewOutcome', task.getVariable('imwf_reviewOutcome'));
execution.setVariable('imwf_reviewComments', (task.hasVariable('imwf_reviewOutcome') ? task.getVariable('imwf_reviewOutcome') : task.getVariable('bpm_comment')));
execution.setVariable('imwf_reviewer', person.properties.userName);
</activiti:string>
</activiti:field>