From 8cb2075b7aa9c170132d78259c434bd33d431352 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Tue, 31 Aug 2021 22:44:55 +0200 Subject: [PATCH] Fix simple search. Closes #1168 --- app/Http/Controllers/SearchController.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 2395188e3..48d487441 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -41,15 +41,21 @@ class SearchController extends BasePageController ] ); - if ($searchType === 'basic' && $request->missing('searchadvr') && ($request->has('id') || $request->has('subject'))) { + dump($request->all()); + + if ($searchType === 'basic' && $request->missing('searchadvr') && ($request->has('id') || $request->has('subject') || $request->has('search'))) { $searchString = []; switch (true) { - case $request->has('subject'): + case $request->filled('subject'): $searchString['searchname'] = (string) $request->input('subject'); $this->smarty->assign('subject', $searchString['searchname']); break; - case $request->has('id'): + case $request->filled('id'): $searchString['searchname'] = (string) $request->input('id'); + $this->smarty->assign('id', $searchString['searchname']); + break; + case $request->filled('search'): + $searchString['searchname'] = (string) $request->input('search'); $this->smarty->assign('search', $searchString['searchname']); break; }