r1045 - in xwiki/trunk/src/main: java/com/xpn/xwiki/notify resources web/templates

[Ludovic Dubost]

Author: ludovic
Date: 2006-04-12 11:23:26 +0200 (Wed, 12 Apr 2006)
New Revision: 1045

Modified:
   xwiki/trunk/src/main/java/com/xpn/xwiki/notify/XWikiNotificationManager.java
   xwiki/trunk/src/main/resources/ApplicationResources.properties
   xwiki/trunk/src/main/resources/ApplicationResources_en.properties
   xwiki/trunk/src/main/resources/ApplicationResources_fr.properties
   xwiki/trunk/src/main/web/templates/httpheader.vm
Log:
Added virtual wiki rules in notification manager
Added advanced text in resources
Fixed language field in lock URLs

Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/notify/XWikiNotificationManager.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/notify/XWikiNotificationManager.java	2006-04-12 06:51:40 UTC (rev 1044)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/notify/XWikiNotificationManager.java	2006-04-12 09:23:26 UTC (rev 1045)
@@ -1,24 +1,24 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author sdumitriu
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author sdumitriu
+ */
 
 package com.xpn.xwiki.notify;
 
@@ -77,6 +77,14 @@
             for (int i=0;i<vnamedrules.size();i++)
                ((XWikiNotificationRule)vnamedrules.get(i)).verify(newdoc, olddoc, context);
         }
+
+        name = context.getDatabase() + ":" + newdoc.getFullName();
+        vnamedrules = getNamedRules(name);
+        if (vnamedrules!=null) {
+            for (int i=0;i<vnamedrules.size();i++)
+               ((XWikiNotificationRule)vnamedrules.get(i)).verify(newdoc, olddoc, context);
+        }
+
         for (int i=0;i<generalrules.size();i++)
             ((XWikiNotificationRule)generalrules.get(i)).verify(newdoc, olddoc, context);
     }

Modified: xwiki/trunk/src/main/resources/ApplicationResources.properties
===================================================================
--- xwiki/trunk/src/main/resources/ApplicationResources.properties	2006-04-12 06:51:40 UTC (rev 1044)
+++ xwiki/trunk/src/main/resources/ApplicationResources.properties	2006-04-12 09:23:26 UTC (rev 1045)
@@ -206,7 +206,7 @@
 macros_mapping=Macro Mapping
 notification_pages=Notification Pages
 auth_active_check=Check Active fields for user authentication
-rememberme=Remember me on this computer
+advanced=Advance
 
 chartwizard=Chart Wizard
 chwhide=hide

Modified: xwiki/trunk/src/main/resources/ApplicationResources_en.properties
===================================================================
--- xwiki/trunk/src/main/resources/ApplicationResources_en.properties	2006-04-12 06:51:40 UTC (rev 1044)
+++ xwiki/trunk/src/main/resources/ApplicationResources_en.properties	2006-04-12 09:23:26 UTC (rev 1045)
@@ -207,6 +207,7 @@
 notification_pages=Notification Pages
 auth_active_check=Check Active fields for user authentication
 rememberme=Remember me on this computer
+advanced=Advanced
 
 chartwizard=Chart Wizard
 chwhide=hide

Modified: xwiki/trunk/src/main/resources/ApplicationResources_fr.properties
===================================================================
--- xwiki/trunk/src/main/resources/ApplicationResources_fr.properties	2006-04-12 06:51:40 UTC (rev 1044)
+++ xwiki/trunk/src/main/resources/ApplicationResources_fr.properties	2006-04-12 09:23:26 UTC (rev 1045)
@@ -207,4 +207,5 @@
 macros_mapping=Correspondance des Macros
 notification_pages=Pages de Notifications
 auth_active_check=Verifier le champ 'Actif' lors de l'authentification
-rememberme=Mémoriser compte et mot de passe
\ No newline at end of file
+rememberme=Mémoriser compte et mot de passe
+advanced=Avancé
\ No newline at end of file

Modified: xwiki/trunk/src/main/web/templates/httpheader.vm
===================================================================
--- xwiki/trunk/src/main/web/templates/httpheader.vm	2006-04-12 06:51:40 UTC (rev 1044)
+++ xwiki/trunk/src/main/web/templates/httpheader.vm	2006-04-12 09:23:26 UTC (rev 1045)
@@ -47,9 +47,9 @@
  function lockEdit(){
     if (lockEditFlag==false) {
 #if($context.action=="inline")
-      var surl = "$doc.getExternalURL("lock")?action=inline&language=${request.language}";
+      var surl = "$doc.getExternalURL("lock")?action=inline&language=$!{request.language}";
 #else
-      var surl = "$doc.getExternalURL("lock")?language=${request.language}";
+      var surl = "$doc.getExternalURL("lock")?language=$!{request.language}";
 #end
       var myAjax = new Ajax.Request(
                 surl,