From d5f516853d58aa4a3dfdf1989d3cdb4623d00b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Thu, 16 Aug 2018 22:38:47 +0200 Subject: [PATCH] properly handle wrong and default sort arg in dash table list --- app/Http/Controllers/DashController.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/DashController.php b/app/Http/Controllers/DashController.php index 97b1366..d220fcf 100644 --- a/app/Http/Controllers/DashController.php +++ b/app/Http/Controllers/DashController.php @@ -20,7 +20,9 @@ class DashController extends Controller return back(); } - $data['tableSort'] = $sort = \Input::get('tableSort', 'last-updated'); + $defaultSort = 'last-updated'; + + $sort = \Input::get('tableSort', $defaultSort); $data['sortOptions'] = [ 'most-visited' => 'Most Visited', @@ -34,6 +36,12 @@ class DashController extends Controller 'least-rows' => 'Shortest', ]; + if (!in_array($sort, array_keys($data['sortOptions']))) { + $sort = $defaultSort; + } + + $data['tableSort'] = $sort; + $data['users'] = User::orderBy('updated_at', 'desc') ->withCount(['tables']) ->paginate(10, ['id', 'title', 'name', 'tables_count'], 'userPage')