From 48aabf0d664746b02c43938bfd77b8a0c9e498da Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 18 Jul 2021 14:45:25 +0200
Subject: [PATCH] Fixed #628 - search: show pagination on bottom too
---
src/main/resources/templates/search/search.ftl | 4 +++-
src/main/resources/templates/search/searchMacros.ftl | 4 ++--
.../budgetmaster/integration/selenium/SearchTest.java | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/templates/search/search.ftl b/src/main/resources/templates/search/search.ftl
index 9f2dfa6ff..f962e9df4 100644
--- a/src/main/resources/templates/search/search.ftl
+++ b/src/main/resources/templates/search/search.ftl
@@ -29,7 +29,7 @@
<input type="hidden" name="page" id="inputPageNumber" value="${page.getNumber()}"/>
</form>
- <@searchMacros.pagination page/>
+ <@searchMacros.pagination page "top"/>
<div class="row search-container">
<div class="col s12">
@@ -77,6 +77,8 @@
</#if>
</div>
</div>
+
+ <@searchMacros.pagination page "bottom"/>
</@header.content>
</div>
</main>
diff --git a/src/main/resources/templates/search/searchMacros.ftl b/src/main/resources/templates/search/searchMacros.ftl
index e3ae3030d..863786171 100644
--- a/src/main/resources/templates/search/searchMacros.ftl
+++ b/src/main/resources/templates/search/searchMacros.ftl
@@ -58,8 +58,8 @@
</div>
</#macro>
-<#macro pagination page>
- <div class="row">
+<#macro pagination page position>
+ <div class="row pagination-position-${position}">
<div class="col s12 center-align">
<#if page.getTotalPages() gt 0>
<ul class="pagination">
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/SearchTest.java b/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/SearchTest.java
index e64b6e2f7..17eb2e051 100644
--- a/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/SearchTest.java
+++ b/src/test/java/de/deadlocker8/budgetmaster/integration/selenium/SearchTest.java
@@ -80,7 +80,7 @@ class SearchTest extends SeleniumTestBase
void pagination()
{
// === PAGE 1 ===
- List<WebElement> pages = driver.findElements(By.cssSelector(".pagination li"));
+ List<WebElement> pages = driver.findElements(By.cssSelector(".pagination-position-top .pagination li"));
assertThat(pages.size()).isEqualTo(5);
assertThat(pages.get(0).getAttribute("class")).contains("disabled");
@@ -97,7 +97,7 @@ class SearchTest extends SeleniumTestBase
// === PAGE 1 ===
pages.get(3).click();
- pages = driver.findElements(By.cssSelector(".pagination li"));
+ pages = driver.findElements(By.cssSelector(".pagination-position-top .pagination li"));
assertThat(pages.size()).isEqualTo(5);
// previous button should be enabled
--
GitLab