From e623c18ee319f7dfb15ea0a4fca9a4ef69e209d1 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 22 Jun 2019 21:02:55 +0200
Subject: [PATCH] Fixed #453 - add settings for number of results in search
page
---
.../budgetmaster/services/HelpersService.java | 5 +++++
src/main/resources/languages/_de.properties | 3 ++-
src/main/resources/languages/_en.properties | 3 ++-
.../resources/templates/settings/settings.ftl | 16 ++++++++++++++++
4 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
index d90b807a0..236885cec 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
@@ -105,6 +105,11 @@ public class HelpersService
return Arrays.asList(LanguageType.values());
}
+ public List<Integer> getAvailableNumberOfSearchResultsPerPage()
+ {
+ return Arrays.asList(10, 20, 25, 30, 50, 100);
+ }
+
// Replaces line breaks and tabs with spaces
public String getFlatText(String text)
{
diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties
index dd25b1651..2591ba91f 100644
--- a/src/main/resources/languages/_de.properties
+++ b/src/main/resources/languages/_de.properties
@@ -163,13 +163,14 @@ settings.updates.automatic.activated=An
settings.updates.search=Suchen
settings.updates.current.version=Installiert:
settings.updates.latest.version=Verf�gbar:
+settings.update.start=Aktualisieren
settings.database.import=Importieren
settings.database.export=Exportieren
settings.database.delete=L�schen
settings.database.delete.verification=Best�tigungscodes
-settings.update.start=Aktualisieren
+settings.search.itemsPerPage=Anzahl der Suchergebnisse pro Seite
account.new.label.name=Name
account.default.name=Standardkonto
diff --git a/src/main/resources/languages/_en.properties b/src/main/resources/languages/_en.properties
index 6b23e2279..516de0089 100644
--- a/src/main/resources/languages/_en.properties
+++ b/src/main/resources/languages/_en.properties
@@ -164,13 +164,14 @@ settings.updates.automatic.activated=On
settings.updates.search=Search
settings.updates.current.version=Installed:
settings.updates.latest.version=Available:
+settings.update.start=Update
settings.database.import=Import
settings.database.export=Export
settings.database.delete=Delete
settings.database.delete.verification=Verification Code
-settings.update.start=Update
+settings.search.itemsPerPage=Number of search results per page
account.new.label.name=Name
account.default.name=Default Account
diff --git a/src/main/resources/templates/settings/settings.ftl b/src/main/resources/templates/settings/settings.ftl
index faaf8c818..489c16b30 100644
--- a/src/main/resources/templates/settings/settings.ftl
+++ b/src/main/resources/templates/settings/settings.ftl
@@ -104,6 +104,22 @@
</div>
</div>
+ <#-- search items per page -->
+ <div class="row">
+ <div class="input-field col s12 m12 l8 offset-l2">
+ <select id="settings-search-items-per-page" name="searchItemsPerPage" <@validation.validation "searchItemsPerPage"/>>
+ <#list helpers.getAvailableNumberOfSearchResultsPerPage() as number>
+ <#if settings.getSearchItemsPerPage() == number>
+ <option selected value="${number}">${number}</option>
+ <#else>
+ <option value="${number}">${number}</option>
+ </#if>
+ </#list>
+ </select>
+ <label for="settings-search-items-per-page">${locale.getString("settings.search.itemsPerPage")}</label>
+ </div>
+ </div>
+
<br>
<#-- buttons -->
--
GitLab