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 =================================================================== --- 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="fullUrl" includeParams="get"/> <s:set var="paginationUrl" value="%{getPaginationUrl(#fullUrl)}"/> - <s:if test="pagination.firstPageIndex > 2"> + <s:if test="pagination.firstPage > 2"> <li> <a href="${paginationUrl}1">1</a> </li> @@ -224,9 +224,9 @@ </li> </s:if> - <s:iterator var="currentPageIndex" begin="pagination.firstPage" end="pagination.lastPage"> - <li class="<s:if test="#currentPageIndex == pagination.currentPage">active</s:if>"> - <a href="${paginationUrl}${currentPageIndex}"> + <s:iterator var="currentPage" begin="pagination.firstPage" end="pagination.lastPage"> + <li class="<s:if test="#currentPage == pagination.currentPage">active</s:if>"> + <a href="${paginationUrl}${currentPage}"> <s:property/> </a> </li>