From 24a5e8a3a6f89d2f579066195ba18153ea5be7a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Mon, 2 Nov 2020 16:05:48 +0300 Subject: [PATCH] use findOrFail for dashboard --- app/Http/Controllers/Common/Dashboards.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Common/Dashboards.php b/app/Http/Controllers/Common/Dashboards.php index 53afd6784..633e87057 100644 --- a/app/Http/Controllers/Common/Dashboards.php +++ b/app/Http/Controllers/Common/Dashboards.php @@ -13,6 +13,7 @@ use App\Models\Common\Widget; use App\Traits\DateTime; use App\Traits\Users; use App\Utilities\Widgets; +use Illuminate\Database\Eloquent\ModelNotFoundException; class Dashboards extends Controller { @@ -51,9 +52,9 @@ class Dashboards extends Controller { $dashboard_id = $dashboard_id ?? session('dashboard_id'); - if (!empty($dashboard_id)) { - $dashboard = Dashboard::find($dashboard_id); - } else { + try { + $dashboard = Dashboard::findOrFail($dashboard_id); + } catch (ModelNotFoundException $e) { $dashboard = user()->dashboards()->enabled()->first(); }