[xwiki-notifications] r5862 - xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode

[SVN]

Author: tmortagne
Date: 2007-11-14 13:56:44 +0100 (Wed, 14 Nov 2007)
New Revision: 5862

Modified:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
Log:
XAWM-16 :
  * fix foreach containing List.add() call.
  * fix call to List.sublist() with wrong parameter.

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
  2007-11-14 08:55:55 UTC (rev 5861)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
  2007-11-14 12:56:44 UTC (rev 5862)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1191514175000</creationDate>
-<date>1191868158000</date>
-<contentUpdateDate>1192719385000</contentUpdateDate>
-<version>1.1</version>
+<date>1195044573000</date>
+<contentUpdateDate>1195044573000</contentUpdateDate>
+<version>1.29</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -53,34 +53,34 @@
 <tags/>
 </property>
 </object>
-<content>#includeMacros("WikiCode.Macros")
-
-#############################################################################
-
-#if(!$nb)
-  #set($nb = 30)
-#end
-
-#if(!$wikinamelist)
-  #if(!$wikiname)
-    #set($wikinamelist = [$context.Database])
-  #else
-    #set($wikinamelist = [$wikiname])
-  #end
-#end
-
-#set($documentlist = [])
-#foreach($wikiname in $wikinamelist)
-  #addlastwikimodifications($documentlist $wikiname $usermodifications 
$usermodificationswiki $nb)
-#end
-
-#if($documentlist.size() &gt; $nb)
-  #set($documentlist = $documentlist.subList(0, $nb-1))
-#end
-
-#############################################################################
-
-#foreach ($item in $documentlist)
-  #displaymodification($item.name $item.prefixedFullName $item.date 
$formatDate $item.author true)
+<content>#includeMacros("WikiCode.Macros")
+
+#############################################################################
+
+#if(!$nb)
+  #set($nb = 30)
+#end
+
+#if(!$wikinamelist)
+  #if(!$wikiname)
+    #set($wikinamelist = [$context.Database])
+  #else
+    #set($wikinamelist = [$wikiname])
+  #end
+#end
+
+#set($documentlist = [])
+#foreach($wikiname in $wikinamelist)
+  #addlastwikimodifications($documentlist $wikiname $usermodifications 
$usermodificationswiki $nb)
+#end
+
+#if($documentlist.size() &gt; $nb)
+  #set($documentlist = $documentlist.subList(0, $nb))
+#end
+
+#############################################################################
+
+#foreach ($item in $documentlist)
+  #displaymodification($item.name $item.prefixedFullName $item.date 
$formatDate $item.author true)
 #end</content>
 </xwikidoc>

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
        2007-11-14 08:55:55 UTC (rev 5861)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
        2007-11-14 12:56:44 UTC (rev 5862)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1191858101000</creationDate>
-<date>1192967356000</date>
-<contentUpdateDate>1192967356000</contentUpdateDate>
-<version>1.2</version>
+<date>1195041935000</date>
+<contentUpdateDate>1195041935000</contentUpdateDate>
+<version>1.5</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
     2007-11-14 08:55:55 UTC (rev 5861)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
     2007-11-14 12:56:44 UTC (rev 5862)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1191500546000</creationDate>
-<date>1194872334000</date>
-<contentUpdateDate>1194872334000</contentUpdateDate>
-<version>1.6</version>
+<date>1195043959000</date>
+<contentUpdateDate>1195043959000</contentUpdateDate>
+<version>1.19</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -108,19 +108,20 @@
   #end
   #set($sql = "${sql} order by doc.date desc")
 
-  #set ($list = $xwiki.searchDocuments($sql , $nb , 0))
+  #set($list = $xwiki.searchDocuments($sql , $nb , 0))
 
   #foreach($docname in $list)
     #if ($xwiki.hasAccessLevel("view", $context.user, 
"${context.database}:${docname}"))
       #set($item = $xwiki.getDocument($docname))
-      #set($added = false)
+      #set($insertAt = $xwiki.null)
       #foreach($sorteddoc in $documentlist)
-        #if(!$added &amp;&amp; $sorteddoc.date.before($item.date))
-          $documentlist.add($velocityCount, $item)
-          #set($added = true)
+        #if(!$insertAt &amp;&amp; $sorteddoc.date.before($item.date))
+          #set($inserAt = $velocityCount-1)
         #end
       #end
-      #if(!$added)
+      #if($inserAt)
+        #set($added = $documentlist.add($inserAt, $item))
+      #else
         #set($added = $documentlist.add($item))
       #end
     #end

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