[xwiki-notifications] r7915 - xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist

[SVN]

Author: jvdrean
Date: 2008-02-22 12:09:47 +0100 (Fri, 22 Feb 2008)
New Revision: 7915

Modified:
   
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListJob.java
Log:
XPWATCHLIST-14 : Allow to override email template in subwikis and allow to set 
the email template to use directly in the job

Modified: 
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListJob.java
===================================================================
--- 
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListJob.java
 2008-02-22 11:07:00 UTC (rev 7914)
+++ 
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListJob.java
 2008-02-22 11:09:47 UTC (rev 7915)
@@ -311,8 +311,15 @@
         String sender = xwiki.getXWikiPreference("admin_email", "[EMAIL 
PROTECTED]");
 
         // Set email template
-        String mailTemplate =
+        String mailTemplate = "";
+        if (xwiki.exists(jobMailTemplate)) {
+            mailTemplate = jobMailTemplate;
+        } else if (xwiki.exists(WatchListPlugin.WATCHLIST_EMAIL_TEMPLATE)) {
+            mailTemplate = WatchListPlugin.WATCHLIST_EMAIL_TEMPLATE;
+        } else {
+            mailTemplate =
                 xcontext.getMainWikiName() + ":" + 
WatchListPlugin.WATCHLIST_EMAIL_TEMPLATE;
+        }
 
         // Send message from template
         int sendResult =

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications