From b3da43921b4f72e565f980b204f2e25962def728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Tue, 15 Mar 2016 13:59:06 +0100 Subject: [PATCH] FEATURE: prevent searching empty string. This commit adds exception handling for serching empty string --- app/Http/Controllers/Admin/Search.php | 10 ++++++++-- resources/views/admin/search/page.blade.php | 12 ++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/Search.php b/app/Http/Controllers/Admin/Search.php index 76658312..744e561d 100644 --- a/app/Http/Controllers/Admin/Search.php +++ b/app/Http/Controllers/Admin/Search.php @@ -11,12 +11,18 @@ class Search extends Controller { public function getSearch() { - $results = []; $term = Input::get('search'); if (!is_null($term)) { - $results = $this->performSearch($term); + try { + $results = $this->performSearch($term); + } catch (InvalidArgumentException $e) { + // user entered empty string (or something like empty string) + return redirect() + ->route('search') + ->with('error', $e->getMessage()); + } } return view('admin.search.page', ['search' => $term, 'results' => $results]); diff --git a/resources/views/admin/search/page.blade.php b/resources/views/admin/search/page.blade.php index 0eb9deb4..cbf25edb 100644 --- a/resources/views/admin/search/page.blade.php +++ b/resources/views/admin/search/page.blade.php @@ -8,6 +8,18 @@

@lang('search.pageTitle')

+ @if (session('success')) +
+ {{ session('success') }} +
+ @endif + + @if (session('error')) +
+ {{ session('error') }} +
+ @endif + @if ($search)