Fix pagination behaviour with search parameters

MarkRobbo · MarkRobbo · commit 07ea91f1f0b5 · 2017-08-10T15:59:56.000+01:00
diff --git a/src/main/resources/templates/fragments/pagination.html b/src/main/resources/templates/fragments/pagination.html
@@ -25,43 +25,43 @@
 </head>
 <body>
     <nav th:fragment="workflowControl" class="text-center">
-        <ul class="pagination">
+        <ul class="pagination" th:with="searchParam=${search != null} ? '&amp;search=' + ${search} : ''">
             <li th:class="${pages.getPageNumber() == 0}? 'disabled' : ''">
                 <span th:if="${pages.getPageNumber() == 0}" aria-hidden="true">First</span>
-                <a th:unless="${pages.getPageNumber() == 0}" th:href="@{'?page=0&amp;size=' + ${pages.getPageSize()} + '&amp;search=' + ${search}}">First</a>
+                <a th:unless="${pages.getPageNumber() == 0}" th:href="@{'?page=0&amp;size=' + ${pages.getPageSize()}}">First</a>
             </li>
             <li th:class="${workflows.hasPrevious()} ? '' : 'disabled'">
                 <span th:unless="${workflows.hasPrevious()}">&laquo;</span>
-                <a href="#" th:if="${workflows.hasPrevious()}" th:href="@{'?page=' + ${pages.getPageNumber() - 1} + '&amp;size=' + ${pages.getPageSize()} + '&amp;search=' + ${search}}">&laquo;</a>
+                <a href="#" th:if="${workflows.hasPrevious()}" th:href="@{'?page=' + ${pages.getPageNumber() - 1} + '&amp;size=' + ${pages.getPageSize()} + ${searchParam}}">&laquo;</a>
             </li>
             <li th:if="${pages.getPageNumber() - 2 &gt; 0}">
-                <a href="#" th:text="${pages.getPageNumber() - 2}" th:href="@{'?page=' + ${pages.getPageNumber() - 3} + '&amp;size=' + ${pages.getPageSize()} + '&amp;search=' + ${search}}">1</a>
+                <a href="#" th:text="${pages.getPageNumber() - 2}" th:href="@{'?page=' + ${pages.getPageNumber() - 3} + '&amp;size=' + ${pages.getPageSize()} + ${searchParam}}">1</a>
             </li>
             <li th:if="${pages.getPageNumber() - 1 &gt; 0}">
-                <a href="#" th:text="${pages.getPageNumber() - 1}" th:href="@{'?page=' + ${pages.getPageNumber() - 2} + '&amp;size=' + ${pages.getPageSize()} + '&amp;search=' + ${search}}">2</a>
+                <a href="#" th:text="${pages.getPageNumber() - 1}" th:href="@{'?page=' + ${pages.getPageNumber() - 2} + '&amp;size=' + ${pages.getPageSize()} + ${searchParam}}">2</a>
             </li>
             <li th:if="${workflows.hasPrevious()}">
-                <a href="#" th:text="${pages.getPageNumber()}" th:href="@{'?page=' + ${pages.getPageNumber() - 1} + '&amp;size=' + ${pages.getPageSize()} + '&amp;search=' + ${search}}">3</a>
+                <a href="#" th:text="${pages.getPageNumber()}" th:href="@{'?page=' + ${pages.getPageNumber() - 1} + '&amp;size=' + ${pages.getPageSize()} + ${searchParam}}">3</a>
             </li>
             <li th:class="active">
                 <span th:text="${pages.getPageNumber() + 1}">4</span>
             </li>
             <li th:if="${workflows.hasNext()}">
-                <a href="#" th:text="${pages.getPageNumber() + 2}" th:href="@{'?page=' + ${pages.getPageNumber() + 1} + '&amp;size=' + ${pages.getPageSize()} + '&amp;search=' + ${search}}">5</a>
+                <a href="#" th:text="${pages.getPageNumber() + 2}" th:href="@{'?page=' + ${pages.getPageNumber() + 1} + '&amp;size=' + ${pages.getPageSize()} + ${searchParam}}">5</a>
             </li>
             <li th:if="${pages.getPageNumber() + 2 &lt; workflows.getTotalPages()}">
-                <a href="#" th:text="${pages.getPageNumber() + 3}" th:href="@{'?page=' + ${pages.getPageNumber() + 2} + '&amp;size=' + ${pages.getPageSize()} + '&amp;search=' + ${search}}">6</a>
+                <a href="#" th:text="${pages.getPageNumber() + 3}" th:href="@{'?page=' + ${pages.getPageNumber() + 2} + '&amp;size=' + ${pages.getPageSize()} + ${searchParam}}">6</a>
             </li>
             <li th:if="${pages.getPageNumber() + 3 &lt; workflows.getTotalPages()}">
-                <a href="#" th:text="${pages.getPageNumber() + 4}" th:href="@{'?page=' + ${pages.getPageNumber() + 3} + '&amp;size=' + ${pages.getPageSize()} + '&amp;search=' + ${search}}">7</a>
+                <a href="#" th:text="${pages.getPageNumber() + 4}" th:href="@{'?page=' + ${pages.getPageNumber() + 3} + '&amp;size=' + ${pages.getPageSize()} + ${searchParam}}">7</a>
             </li>
             <li th:class="${workflows.hasNext()} ? '' : 'disabled'">
                 <span th:unless="${workflows.hasNext()}">&raquo;</span>
-                <a th:if="${workflows.hasNext()}" th:href="@{'?page=' + ${pages.getPageNumber() + 1} + '&amp;size=' + ${pages.getPageSize()} + '&amp;search=' + ${search}}" title="Go to next page">&raquo;</a>
+                <a th:if="${workflows.hasNext()}" th:href="@{'?page=' + ${pages.getPageNumber() + 1} + '&amp;size=' + ${pages.getPageSize()} + ${searchParam}}" title="Go to next page">&raquo;</a>
             </li>
             <li th:class="${workflows.getTotalPages() == pages.getPageNumber() + 1} ? 'disabled' : ''">
                 <span th:if="${workflows.getTotalPages() == pages.getPageNumber() + 1}">Last</span>
-                <a th:unless="${workflows.getTotalPages() == pages.getPageNumber() + 1}" th:href="@{'?page=' + ${workflows.getTotalPages() - 1} + '&amp;size=' + ${pages.getPageSize()} + '&amp;search=' + ${search}}">Last</a>
+                <a th:unless="${workflows.getTotalPages() == pages.getPageNumber() + 1}" th:href="@{'?page=' + ${workflows.getTotalPages() - 1} + '&amp;size=' + ${pages.getPageSize()} + ${searchParam}}">Last</a>
             </li>
         </ul>
     </nav>
