Author: tchemit Date: 2014-04-03 09:10:17 +0200 (Thu, 03 Apr 2014) New Revision: 1809 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1809 Log: refs #4490 fix pagination url Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-04-02 17:26:57 UTC (rev 1808) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-04-03 07:10:17 UTC (rev 1809) @@ -129,11 +129,13 @@ public String getPaginationUrl(String fullUrl) { // remove pageIndex params String paginationUrl = fullUrl.replaceAll("pageIndex=\\d+", ""); + // clean & paginationUrl = paginationUrl.replaceAll("&&", "&"); + // add [?|&]pageIndex= if (!paginationUrl.contains("?")) { - paginationUrl += "?pageIndex="; + paginationUrl += "?"; } else if (!paginationUrl.endsWith("?")) { - paginationUrl += "&pageIndex="; + paginationUrl += "&"; } paginationUrl += "pageIndex="; return paginationUrl;