Author: vmassol
Date: 2007-10-04 11:34:19 +0200 (Thu, 04 Oct 2007)
New Revision: 5278
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog/Macros
Log:
XE-132: Prev/Next links don't work
Submitted by Marius Florea
Modified:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog/Macros
===================================================================
--- xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog/Macros
2007-10-03 23:39:54 UTC (rev 5277)
+++ xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/Blog/Macros
2007-10-04 09:34:19 UTC (rev 5278)
@@ -68,8 +68,6 @@
#set($inbitems = $xwiki.parseInt($nbitems))
#set($inbstart = $xwiki.parseInt($nbstart))
#foreach ($item in $xwiki.searchDocuments($sql, $inbitems, $inbstart))
-## The default foreach counter, $velocityCount, cannot be used outside of the
foreach body!
-#set($velocityCountOutsideForeachBody = $velocityCount)
#set($bentrydoc = $xwiki.getDocument($item))
#if($bentrydoc.fullName == $item)
#set($bentryobj = $bentrydoc.getObject("XWiki.ArticleClass"))
@@ -103,15 +101,19 @@
#end
##
## prev/next links
-#if(($inbstart != 0) || ($velocityCountOutsideForeachBody==$inbitems))
+#if (!$velocityCount)
+## if $velocityCount has not been initialized (e.g. $xwiki.searchDocuments has
returned an empty list)
+#set($velocityCount = -1)
+#end
+#if(($inbstart != 0) || ($velocityCount==$inbitems))
<div class="pagingLinks">
#if ($inbstart!=0)
#set($iprev = $inbstart - $inbitems)
-<span
class="prevPage">[Previous>$doc.name?nbstart=${iprev}]</span>
+<span
class="prevPage">[Previous>$doc.name?category=$!category&nbstart=${iprev}]</span>
#end
-#if($velocityCountOutsideForeachBody==$inbitems)
+#if($velocityCount==$inbitems)
#set($inext = $inbstart + $inbitems)
-<span class="nextPage">[Next>$doc.name?nbstart=${inext}]</span>
+<span
class="nextPage">[Next>$doc.name?category=$!category&nbstart=${inext}]</span>
#end
<span class="clear"></span>
</div> ## pagingLinks
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
