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

[SVN]

Author: jvdrean
Date: 2008-01-18 19:09:45 +0100 (Fri, 18 Jan 2008)
New Revision: 6961

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/WatchListPlugin.java
Log:
XPWATCHLIST-11 : In virtual mode watchlist must create only one email template 
(in the main wiki)

mainXWiki name is no longer hardcoded

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-01-18 18:01:53 UTC (rev 6960)
+++ 
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListJob.java
 2008-01-18 18:09:45 UTC (rev 6961)
@@ -306,6 +306,6 @@
         // Send message from template
         int sendResult =
             emailService.sendMessageFromTemplate(sender, emailAddr, null,
-                null, language, WatchListPlugin.WATCHLIST_EMAIL_TEMPLATE, 
vcontext);
+                null, language, xcontext.getMainWikiName() + ":" + 
WatchListPlugin.WATCHLIST_EMAIL_TEMPLATE, vcontext);
     }
 }

Modified: 
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListPlugin.java
===================================================================
--- 
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListPlugin.java
      2008-01-18 18:01:53 UTC (rev 6960)
+++ 
xwiki-platform/xwiki-plugins/trunk/watchlist/src/main/java/com/xpn/xwiki/plugin/watchlist/WatchListPlugin.java
      2008-01-18 18:09:45 UTC (rev 6961)
@@ -47,7 +47,7 @@
  */
 public class WatchListPlugin extends XWikiDefaultPlugin implements 
XWikiPluginInterface
 {
-    public static String WATCHLIST_EMAIL_TEMPLATE = 
"xwiki:XWiki.WatchListMessage";
+    public static String WATCHLIST_EMAIL_TEMPLATE = "XWiki.WatchListMessage";
 
     public static String WATCHLIST_EMAIL_JOB_COMMON_NAME = 
"Scheduler.WatchListJob";
 
@@ -285,7 +285,7 @@
         boolean needsUpdate = false;
 
         try {
-            doc = xwiki.getDocument(WATCHLIST_EMAIL_TEMPLATE, context);
+            doc = xwiki.getDocument(context.getMainXWiki() + ":" + 
WATCHLIST_EMAIL_TEMPLATE, context);
             BaseObject obj = 
doc.getObject(MailSenderPlugin.EMAIL_XWIKI_CLASS_NAME);
             if (obj == null) {
                 needsUpdate = true;

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