Skip to content

Commit 2c7e73e

Browse files
committed
## 3.0.0.rc.3
* fixed #403 Task pagination is broken due to dependencies * fixed #407 update Last Login Date is broken
1 parent 37cc17e commit 2c7e73e

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

src/main/resources/templates/layout/tasks.html

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,13 @@ <h5 class="modal-title" id="taskModalScrollableTitle">
269269
<div class="col">
270270
<nav aria-label="Task Pagination">
271271
<ul class="pagination">
272-
<li class="page-item">
273-
<a th:href="@{{myUrlPath}/{myTaskState}?page={page}(myUrlPath=${myUrlPath},myTaskState=${#strings.toLowerCase(myTaskState)},page=${1})}" class="page-link" aria-label="Previous">
272+
<li class="page-item disabled" th:if="${page.isFirst}">
273+
<a href="#" class="page-link" aria-label="Previous">
274+
<span aria-hidden="true">&laquo;</span>
275+
</a>
276+
</li>
277+
<li class="page-item" th:unless="${page.isFirst}">
278+
<a th:href="@{{myUrlPath}/{myTaskState}?page={page}(myUrlPath=${myUrlPath},myTaskState=${#strings.toLowerCase(myTaskState)},page=${page.previousPageable.pageNumber})}" class="page-link" aria-label="Previous">
274279
<span aria-hidden="true">&laquo;</span>
275280
</a>
276281
</li>
@@ -282,8 +287,13 @@ <h5 class="modal-title" id="taskModalScrollableTitle">
282287
<span th:text="${i+1}">1</span>
283288
</a>
284289
</li>
285-
<li class="page-item">
286-
<a th:href="@{{myUrlPath}/{myTaskState}?page={page}(myUrlPath=${myUrlPath},myTaskState=${#strings.toLowerCase(myTaskState)},page=${page.totalPages-1})}" class="page-link" aria-label="Next">
290+
<li class="page-item" th:if="${page.hasNext}">
291+
<a th:href="@{{myUrlPath}/{myTaskState}?page={page}(myUrlPath=${myUrlPath},myTaskState=${#strings.toLowerCase(myTaskState)},page=${page.nextPageable.pageNumber})}" class="page-link" aria-label="Next">
292+
<span aria-hidden="true">&raquo;</span>
293+
</a>
294+
</li>
295+
<li class="page-item disabled" th:unless="${page.hasNext}">
296+
<a href="#" class="page-link" aria-label="Previous">
287297
<span aria-hidden="true">&raquo;</span>
288298
</a>
289299
</li>

0 commit comments

Comments
 (0)