# HG changeset patch # User Mike Becker # Date 1760003379 -7200 # Node ID bf220daedabef70b850965e2628d3dbe39fcadf9 # Parent d23b29972dca5b4075ec3464c5650eb101b712c9 the default filter and sort URLs are now less verbose - fixes #568 diff -r d23b29972dca -r bf220daedabe src/main/kotlin/de/uapcore/lightpit/Constants.kt --- a/src/main/kotlin/de/uapcore/lightpit/Constants.kt Tue Oct 07 10:08:34 2025 +0200 +++ b/src/main/kotlin/de/uapcore/lightpit/Constants.kt Thu Oct 09 11:49:39 2025 +0200 @@ -29,7 +29,7 @@ /** * A data in yyyy-mm-dd format to identify the release. */ - const val VERSION_DATE = "2025-10-06" + const val VERSION_DATE = "2025-10-09" /** * The path where the JSP files reside. diff -r d23b29972dca -r bf220daedabe src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt --- a/src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt Tue Oct 07 10:08:34 2025 +0200 +++ b/src/main/kotlin/de/uapcore/lightpit/viewmodel/Issues.kt Thu Oct 09 11:49:39 2025 +0200 @@ -228,15 +228,22 @@ val category: List = evalEnum(http, "c") val assignee: List = evalInts(http, "u") - val sortPrimary: IssueSorter.Criteria = evalSort(http, "primary", IssueSorter.Criteria(IssueSorter.Field.DONE)) - val sortSecondary: IssueSorter.Criteria = evalSort(http, "secondary", IssueSorter.Criteria(IssueSorter.Field.ETA)) - val sortTertiary: IssueSorter.Criteria = evalSort(http, "tertiary", IssueSorter.Criteria(IssueSorter.Field.UPDATED, false)) + val defaultSortPrimary: IssueSorter.Criteria = IssueSorter.Criteria(IssueSorter.Field.DONE) + val defaultSortSecondary: IssueSorter.Criteria = IssueSorter.Criteria(IssueSorter.Field.ETA) + val defaultSortTertiary: IssueSorter.Criteria = IssueSorter.Criteria(IssueSorter.Field.UPDATED, false) + val sortPrimary: IssueSorter.Criteria = evalSort(http, "primary", defaultSortPrimary) + val sortSecondary: IssueSorter.Criteria = evalSort(http, "secondary", defaultSortSecondary) + val sortTertiary: IssueSorter.Criteria = evalSort(http, "tertiary", defaultSortTertiary) val anyListFilterActive = status.isNotEmpty() || category.isNotEmpty() || assignee.isNotEmpty() fun containsAssignee(user: User?): Boolean = assignee.contains(user?.id?:-1) private fun evalSort(http: HttpRequest, prio: String, defaultValue: IssueSorter.Criteria): IssueSorter.Criteria { + if (http.param("sort").equals("default")) { + http.session.removeAttribute("sort_$prio") + return defaultValue + } val param = http.param("sort_$prio") if (param != null) { http.session.removeAttribute("sort_$prio") diff -r d23b29972dca -r bf220daedabe src/main/webapp/WEB-INF/changelogs/changelog-de.jspf --- a/src/main/webapp/WEB-INF/changelogs/changelog-de.jspf Tue Oct 07 10:08:34 2025 +0200 +++ b/src/main/webapp/WEB-INF/changelogs/changelog-de.jspf Thu Oct 09 11:49:39 2025 +0200 @@ -38,6 +38,7 @@
  • Die Vorschläge in den Suchfeldern für Vorgänge sind nun absteigend nach Vorgangsnummer sortiert.
  • Die Standardkategorie für neue Vorgänge in veröffentlichten Versionen ist nun "Fehler" anstelle von "Feature".
  • Die Links zu den Varianten in der Vorgangsansicht wechseln nun lediglich die geöffnete Variante, anstatt zur Vorgangsliste zurückzukehren.
  • +
  • Die erzeugten URLs für Filter und Sortierung sind nun deutlich schlanker (diese Änderung ist komplett abwärtskompatibel).
  • Positionen der Schaltflächen unterhalb der Vorgangsfilter getauscht, um Konsistent mit allen anderen Schaltflächen in der Anwendung zu sein.
  • Fehlerhafte Delta-Anzeige in RSS-Feeds behoben.
  • Ungefiltertes HTML aus Vorgangsbeschreibungen in RSS-Feeds behoben.
  • diff -r d23b29972dca -r bf220daedabe src/main/webapp/WEB-INF/changelogs/changelog.jspf --- a/src/main/webapp/WEB-INF/changelogs/changelog.jspf Tue Oct 07 10:08:34 2025 +0200 +++ b/src/main/webapp/WEB-INF/changelogs/changelog.jspf Thu Oct 09 11:49:39 2025 +0200 @@ -38,6 +38,7 @@
  • Change that issues suggested by the search boxes are now sorted by ID in descending order.
  • Change that the default category for new issues in released versions is Bug instead of Feature.
  • Change that the variant links in the issue view now stay within the issue and only switch the opened variant.
  • +
  • Change the default filter and sort URLs to be less verbose (fully backwards compatible).
  • Switch position of Apply and Remove buttons below the filter to be in line with the design rule that submit buttons are always right aligned.
  • Fix wrong diffs in RSS feed.
  • Fix unescaped HTML in RSS feed.
  • diff -r d23b29972dca -r bf220daedabe src/main/webapp/WEB-INF/jspf/issue-filter.jspf --- a/src/main/webapp/WEB-INF/jspf/issue-filter.jspf Tue Oct 07 10:08:34 2025 +0200 +++ b/src/main/webapp/WEB-INF/jspf/issue-filter.jspf Thu Oct 09 11:49:39 2025 +0200 @@ -76,17 +76,21 @@ + <%@include file="sort-box.jspf"%> + <%@include file="sort-box.jspf"%> + <%@include file="sort-box.jspf"%>
    - + + - +
    diff -r d23b29972dca -r bf220daedabe src/main/webapp/WEB-INF/jspf/sort-box.jspf --- a/src/main/webapp/WEB-INF/jspf/sort-box.jspf Tue Oct 07 10:08:34 2025 +0200 +++ b/src/main/webapp/WEB-INF/jspf/sort-box.jspf Thu Oct 09 11:49:39 2025 +0200 @@ -2,10 +2,11 @@ Page attribute: sortPriority: String currentSort: IssueSorter.Criteria + defaultSort: IssueSorter.Criteria --%>
    -