From ab7d9ec03d18a2055ec8496c2f589a4668c97f5e Mon Sep 17 00:00:00 2001 From: Ian Morland Date: Fri, 20 Aug 2021 15:31:05 +0100 Subject: [PATCH 1/2] Pass filter params to getApiDocument --- src/Forum/Content/Index.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Forum/Content/Index.php b/src/Forum/Content/Index.php index a290bcecf7..d7043fa544 100644 --- a/src/Forum/Content/Index.php +++ b/src/Forum/Content/Index.php @@ -68,6 +68,7 @@ public function __invoke(Document $document, Request $request) $sort = Arr::pull($queryParams, 'sort'); $q = Arr::pull($queryParams, 'q'); $page = max(1, intval(Arr::pull($queryParams, 'page'))); + $filters = Arr::pull($queryParams, 'filter', []); $sortMap = $this->getSortMap(); @@ -77,6 +78,8 @@ public function __invoke(Document $document, Request $request) 'page' => ['offset' => ($page - 1) * 20, 'limit' => 20] ]; + $params['filter'] = array_merge($filters, $params['filter']); + if ($q) { $params['filter']['q'] = $q; } From 09d8e7da8e9eb4df89280e3afdf9994c14a5f464 Mon Sep 17 00:00:00 2001 From: Ian Morland Date: Fri, 20 Aug 2021 15:35:31 +0100 Subject: [PATCH 2/2] Set filters directly --- src/Forum/Content/Index.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Forum/Content/Index.php b/src/Forum/Content/Index.php index d7043fa544..ca4fe0e650 100644 --- a/src/Forum/Content/Index.php +++ b/src/Forum/Content/Index.php @@ -74,12 +74,10 @@ public function __invoke(Document $document, Request $request) $params = [ 'sort' => $sort && isset($sortMap[$sort]) ? $sortMap[$sort] : '', - 'filter' => [], + 'filter' => $filters, 'page' => ['offset' => ($page - 1) * 20, 'limit' => 20] ]; - $params['filter'] = array_merge($filters, $params['filter']); - if ($q) { $params['filter']['q'] = $q; }