From tchemit@users.forge.codelutin.com Thu Apr  3 19:42:26 2014
From: tchemit@users.forge.codelutin.com
To: wao-commits@list.forge.codelutin.com
Subject:
 [Wao-commits] r1828 -	trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
Date: Thu, 03 Apr 2014 19:42:26 +0200
Message-ID: <20140403174226.B8C091814D9@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4328560278126007437=="

--===============4328560278126007437==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: tchemit
Date: 2014-04-03 19:42:26 +0200 (Thu, 03 Apr 2014)
New Revision: 1828

Url: http://forge.codelutin.com/projects/wao/repository/revisions/1828

Log:
fix pagination

Modified:
   trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp

Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp	2014-04-03=
 17:42:06 UTC (rev 1827)
+++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp	2014-04-03=
 17:42:26 UTC (rev 1828)
@@ -212,7 +212,7 @@
             <ul>
                 <s:url var=3D"fullUrl" includeParams=3D"get"/>
                 <s:set var=3D"paginationUrl" value=3D"%{getPaginationUrl(#fu=
llUrl)}"/>
-                <s:if test=3D"pagination.firstPageIndex > 2">
+                <s:if test=3D"pagination.firstPage > 2">
                     <li>
                         <a href=3D"${paginationUrl}1">1</a>
                     </li>
@@ -224,9 +224,9 @@
                     </li>
                 </s:if>
=20
-                <s:iterator var=3D"currentPageIndex" begin=3D"pagination.fir=
stPage" end=3D"pagination.lastPage">
-                    <li class=3D"<s:if test=3D"#currentPageIndex =3D=3D pagi=
nation.currentPage">active</s:if>">
-                        <a href=3D"${paginationUrl}${currentPageIndex}">
+                <s:iterator var=3D"currentPage" begin=3D"pagination.firstPag=
e" end=3D"pagination.lastPage">
+                    <li class=3D"<s:if test=3D"#currentPage =3D=3D paginatio=
n.currentPage">active</s:if>">
+                        <a href=3D"${paginationUrl}${currentPage}">
                             <s:property/>
                         </a>
                     </li>


--===============4328560278126007437==--