You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2008/08/12 10:46:19 UTC
svn commit: r685086 - in /incubator/jspwiki/trunk: ChangeLog
src/com/ecyrd/jspwiki/Release.java
src/webdocs/templates/default/InfoContent.jsp
Author: brushed
Date: Tue Aug 12 01:46:19 2008
New Revision: 685086
URL: http://svn.apache.org/viewvc?rev=685086&view=rev
Log:
2.7.0-alpha-13: [JSPWIKI-329] Fixed the pagination link for the block 21-40.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=685086&r1=685085&r2=685086&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Aug 12 01:46:19 2008
@@ -1,3 +1,11 @@
+2008-08-12 Dirk Frederickx <di...@gmail.com>
+
+ * 2.7.0-alpha-13
+
+ * [JSPWIKI-329] Pagination link was still not correct for the block 21-40.
+ Amazing catch from Harry and Florian - txs !
+
+
2008-07-31 Andrew Jaquith <ajaquith AT apache DOT org>
* 2.7.0-alpha-12
@@ -49,7 +57,7 @@
Now also the accordion toggles show a blue +/- icon to indicate clickable regions.
Also added a %%leftAccordion and %%rightAccordion style, similar to book-tabs.
- * [JSPWIKI-329] the consistency and correctnes of the pagination links has been improved
+ * [JSPWIKI-329] the consistency and correctness of the pagination links has been improved
in the Page Info screens. Now every block (also the first 1..20) show 20 items;
the link titles also match with the presented block.
The page size are now represented in kB, similar as attachment sizes.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=685086&r1=685085&r2=685086&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Tue Aug 12 01:46:19 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "12";
+ public static final String BUILD = "13";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp?rev=685086&r1=685085&r2=685086&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/InfoContent.jsp Tue Aug 12 01:46:19 2008
@@ -34,12 +34,12 @@
int pagesize = 20;
int startitem = itemcount;
+ if( startitem == pagesize ) startitem = 0;
String parm_start = (String)request.getParameter( "start" );
if( parm_start != null ) startitem = Integer.parseInt( parm_start ) ;
/*round to start of a pagination block */
if( startitem > -1 ) startitem = ( (startitem/pagesize) * pagesize );
- if( startitem == pagesize ) startitem = 0;
%>
<wiki:PageExists>