From 52d64494a569c8df7621b14ef28c666eae147129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yannick=20Mo=CC=88ller?= Date: Mon, 3 Feb 2025 14:27:45 +0100 Subject: [PATCH 1/2] BREAKING: introduce method to buildUnderlyingQueryWithFacets the existent method already does this, but if you already have a page, the filter-facet would be applied doubled. So we simply duplicate the method but without applying the facets and for usages where the facets are needed, now a change is needed. Patch-Task: change buildUnderlyingQuery to buildUnderlyingQueryWithFacets where facets needed. - fixes: SIRI-1054 --- src/main/java/sirius/biz/web/BasePageHelper.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/sirius/biz/web/BasePageHelper.java b/src/main/java/sirius/biz/web/BasePageHelper.java index 04ea36bbd..b7237d9f8 100644 --- a/src/main/java/sirius/biz/web/BasePageHelper.java +++ b/src/main/java/sirius/biz/web/BasePageHelper.java @@ -408,11 +408,21 @@ public Page asPage() { * * @return the {@link Query} object */ + public Q buildUnderlyingQueryWithFacets() { + buildUnderlyingQuery(); + + applyFacets(null); + return baseQuery; + } + + /** + * Returns the underlying query for this page helper. + * + * @return the {@link Query} object + */ public Q buildUnderlyingQuery() { String query = getParameterValue("query").getString(); applyQuery(query); - - applyFacets(null); return baseQuery; } From a8bdf5a88875da681c543953303b2c4f662f7bd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yannick=20M=C3=B6ller?= Date: Tue, 4 Feb 2025 13:06:04 +0100 Subject: [PATCH 2/2] Update src/main/java/sirius/biz/web/BasePageHelper.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Florian Häfner <53555813+fhaScireum@users.noreply.github.com> --- src/main/java/sirius/biz/web/BasePageHelper.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/sirius/biz/web/BasePageHelper.java b/src/main/java/sirius/biz/web/BasePageHelper.java index b7237d9f8..73e55d712 100644 --- a/src/main/java/sirius/biz/web/BasePageHelper.java +++ b/src/main/java/sirius/biz/web/BasePageHelper.java @@ -410,7 +410,6 @@ public Page asPage() { */ public Q buildUnderlyingQueryWithFacets() { buildUnderlyingQuery(); - applyFacets(null); return baseQuery; }