svn commit: r729550 - in /lenya/trunk/src/modules-core/workflow: java/src/org/apache/lenya/cms/workflow/usecases/Submit.java resources/i18n/cmsui.xml resources/i18n/cmsui_de.xml

Author: andreas
Date: Fri Dec 26 14:44:56 2008
New Revision: 729550

URL: http://svn.apache.org/viewvc?rev=729550&view=rev
Log:
Add support for user notification messages to Submit usecase.

Modified:
    lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Submit.java
    lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui.xml
    lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui_de.xml

Modified: lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Submit.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Submit.java?rev=729550&r1=729549&r2=729550&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Submit.java (original)
+++ lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Submit.java Fri Dec 26 14:44:56 2008
@@ -39,10 +39,19 @@
  */
 public class Submit extends InvokeWorkflow {
 
+    /**
+     * The notification message to send in addition to the default message.
+     */
+    public static final String PARAM_USER_NOTIFICATION_MESSAGE = "userNotificationMessage";
+
+    /**
+     * If a notification message shall be sent. 
+     */
+    public static final String PARAM_SEND_NOTIFICATION = "sendNotification";
+    
     protected static final String MESSAGE_SUBJECT = "notification-message";
     protected static final String MESSAGE_DOCUMENT_SUBMITTED = "document-submitted";
-    protected static final String SEND_NOTIFICATION = "sendNotification";
-
+    
     /**
      * @see org.apache.lenya.cms.usecase.AbstractUsecase#doExecute()
      */
@@ -50,7 +59,7 @@
 
         super.doExecute();
         
-        if (Boolean.valueOf(getBooleanCheckboxParameter(SEND_NOTIFICATION)).booleanValue()) {
+        if (Boolean.valueOf(getBooleanCheckboxParameter(PARAM_SEND_NOTIFICATION)).booleanValue()) {
             sendNotification(getSourceDocument());
         }
     }
@@ -82,9 +91,11 @@
             final String webappUrl = authoringVersion.getCanonicalWebappURL();
             url = serverUrl + request.getContextPath() + webappUrl;
         }
+        
+        String userMessage = getParameterAsString(PARAM_USER_NOTIFICATION_MESSAGE, "");
 
         Text[] subjectParams = { new Text(getEvent(), true) };
-        Text[] params = { new Text(url, false) };
+        Text[] params = { new Text(url, false), new Text(userMessage, false) };
         Text subject = new Text(MESSAGE_SUBJECT, subjectParams);
         Text body = new Text(MESSAGE_DOCUMENT_SUBMITTED, params);
         Message message = new Message(subject, body, sender, recipients);

Modified: lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui.xml?rev=729550&r1=729549&r2=729550&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui.xml (original)
+++ lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui.xml Fri Dec 26 14:44:56 2008
@@ -75,8 +75,12 @@
   
   <!-- Notification -->
   <message key="notification-message">Lenya Notification: {0}</message>
-  <message key="document-published">A document you submitted was published: {0}</message>
-  <message key="document-submitted">A document has been submitted for you to review: {0}</message>
+  <message key="document-published">A document you submitted was published: {0}
+  
+{1}</message>
+  <message key="document-submitted">A document has been submitted for you to review: {0}
+    
+{1}</message>
   <message key="document-rejected">A document you submitted was rejected for the following reason: {0}, {1}</message>
   
 </catalogue>

Modified: lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui_de.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui_de.xml?rev=729550&r1=729549&r2=729550&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui_de.xml (original)
+++ lenya/trunk/src/modules-core/workflow/resources/i18n/cmsui_de.xml Fri Dec 26 14:44:56 2008
@@ -76,8 +76,12 @@
   <!-- Notification -->
   <message key="notification-message">Lenya-Benachrichtigung: {0}</message>
   <message key="notify-submitter">Benachrichtigung an den einreichenden Nutzer senden</message>
-  <message key="document-published">Ein von Ihnen eingereichtes Dokument wurde publiziert: {0}</message>
-  <message key="document-submitted">Ein Dokument wurde zur Durchsicht eingereicht: {0}</message>
+  <message key="document-published">Ein von Ihnen eingereichtes Dokument wurde publiziert: {0}
+  
+{1}</message>
+  <message key="document-submitted">Ein Dokument wurde zur Durchsicht eingereicht: {0}
+  
+{1}</message>
   <message key="document-rejected">Ein von Ihnen eingereichtes Dokument wurde aus folgendem Grund zurückgewiesen: {0}, {1}</message>
   
 </catalogue>