From 2c22e7a671a7986de92c2c7f559b0dc99c33c94c Mon Sep 17 00:00:00 2001 From: DariusIII Date: Sat, 11 Jan 2020 04:12:49 +0100 Subject: [PATCH] Fix rest of the cover pages search filters --- Changelog | 1 + app/Http/Controllers/AdultController.php | 2 +- app/Http/Controllers/BooksController.php | 2 +- app/Http/Controllers/ConsoleController.php | 2 +- app/Http/Controllers/MusicController.php | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index 66f6554eb..721114405 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2020-01-11 DariusIII + * Fix: Fix rest of the cover pages search filters * Fix: Fix cover pages search filter 2020-01-10 DariusIII * Chg: Remove reporting of existing tags from ApiV2 capabilities response diff --git a/app/Http/Controllers/AdultController.php b/app/Http/Controllers/AdultController.php index d39e5b857..bab1d67c3 100644 --- a/app/Http/Controllers/AdultController.php +++ b/app/Http/Controllers/AdultController.php @@ -29,7 +29,7 @@ class AdultController extends BasePageController 'title' => $mcat->title, ]; } - $category = Category::XXX_ROOT; + $category = $request->has('t') ? $request->input('t') : Category::XXX_ROOT; if ($id && \in_array($id, Arr::pluck($mtmp, 'title'), false)) { $cat = Category::query() ->where('title', $id) diff --git a/app/Http/Controllers/BooksController.php b/app/Http/Controllers/BooksController.php index 5f7f86ff6..4216f1e58 100644 --- a/app/Http/Controllers/BooksController.php +++ b/app/Http/Controllers/BooksController.php @@ -31,7 +31,7 @@ class BooksController extends BasePageController 'title' => $bcat->title, ]; } - $category = Category::BOOKS_ROOT; + $category = $request->has('t') ? $request->input('t') : Category::BOOKS_ROOT; if ($id && \in_array($id, Arr::pluck($btmp, 'title'), false)) { $cat = Category::query() ->where('title', $id) diff --git a/app/Http/Controllers/ConsoleController.php b/app/Http/Controllers/ConsoleController.php index 1b5dffcac..6f836f9a0 100644 --- a/app/Http/Controllers/ConsoleController.php +++ b/app/Http/Controllers/ConsoleController.php @@ -35,7 +35,7 @@ class ConsoleController extends BasePageController 'title' => $ccat->title, ]; } - $category = Category::GAME_ROOT; + $category = $request->has('t') ? $request->input('t') : Category::GAME_ROOT; if ($id && \in_array($id, Arr::pluck($ctmp, 'title'), false)) { $cat = Category::query() ->where('title', $id) diff --git a/app/Http/Controllers/MusicController.php b/app/Http/Controllers/MusicController.php index 91553aad9..8253a13e5 100644 --- a/app/Http/Controllers/MusicController.php +++ b/app/Http/Controllers/MusicController.php @@ -32,7 +32,7 @@ class MusicController extends BasePageController ]; } - $category = Category::MUSIC_ROOT; + $category = $request->has('t') ? $request->input('t') : Category::MUSIC_ROOT; if ($id && \in_array($id, Arr::pluck($mtmp, 'title'), false)) { $cat = Category::query() ->where('title', $id)