From 75722a4b3540a7b5ebbaa15d3cc098598bda0c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sat, 2 May 2020 19:47:31 +0300 Subject: [PATCH] close #1436 Fixed: Dashboard switch issue --- app/Http/Controllers/Common/Dashboards.php | 2 +- app/Listeners/Menu/AddAdminItems.php | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Common/Dashboards.php b/app/Http/Controllers/Common/Dashboards.php index 9e35852ba..7fb15a2b6 100644 --- a/app/Http/Controllers/Common/Dashboards.php +++ b/app/Http/Controllers/Common/Dashboards.php @@ -51,7 +51,7 @@ class Dashboards extends Controller { $dashboard_id = session('dashboard_id', 0); - if ($dashboard) { + if (!empty($dashboard->id)) { $dashboard_id = $dashboard->id; } diff --git a/app/Listeners/Menu/AddAdminItems.php b/app/Listeners/Menu/AddAdminItems.php index 52436c76e..c17c4bb38 100644 --- a/app/Listeners/Menu/AddAdminItems.php +++ b/app/Listeners/Menu/AddAdminItems.php @@ -26,9 +26,11 @@ class AddAdminItems if ($dashboards->count() > 1) { $menu->dropdown(trim(trans_choice('general.dashboards', 2)), function ($sub) use ($user, $attr, $dashboards) { foreach ($dashboards as $key => $dashboard) { - $path = (session('dashboard_id') == $dashboard->id) ? '/' : '/?dashboard_id=' . $dashboard->id; - - $sub->url($path, $dashboard->name, $key, $attr); + if (session('dashboard_id') != $dashboard->id) { + $sub->route('dashboards.switch', $dashboard->name, ['dashboard' => $dashboard->id], $key, $attr); + } else { + $sub->url('/', $dashboard->name, $key, $attr); + } } }, 1, [ 'url' => '/',