[Aplaws-commit] r1137 - trunk/ccm-cms/src/com/arsdigita/cms/workflow

[<ap...@vh...>]

Author: apevec
Date: 2006-05-15 20:20:14 +0200 (Mon, 15 May 2006)
New Revision: 1137

Modified:
   trunk/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java
Log:
additional element from notification text customisation
{9} - authoring URL (...&set_tab=1)


Modified: trunk/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java	2006-05-11 14:19:52 UTC (rev 1136)
+++ trunk/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java	2006-05-15 18:20:14 UTC (rev 1137)
@@ -256,10 +256,11 @@
         // for enable events, this will be the finish URL
         // for everything else, it will be the item authoring URL
         String emailURL = null;
+        String authoringURL = getAuthoringURL(item);
         if (ENABLE_OP.equals(operation)) {
             emailURL = getFinishURL(item.getID());
         } else {
-            emailURL = getAuthoringURL(item);
+            emailURL = authoringURL;
         }
         String fullURL = URL.there(emailURL, null).getURL();
         // see CMSResources.properties for how these values are used
@@ -284,6 +285,7 @@
             g11nArgs[7] = (String) GlobalizationUtil.globalize("cms.ui.unknown").localize();
         }
         g11nArgs[8] = getStartDate();
+        g11nArgs[9] = authoringURL;
         String subject = (String) GlobalizationUtil.globalize("cms.ui.workflow.email.subject." + operation,
                                                      g11nArgs).localize();
         String body = (String) GlobalizationUtil.globalize("cms.ui.workflow.email.body." + operation,