From 1461c225dd6ade7254cf288bde1138dcc35fd9ff Mon Sep 17 00:00:00 2001 From: CarliPinell Date: Fri, 22 Nov 2024 12:44:29 -0400 Subject: [PATCH 1/2] saving progress --- ProcessMaker/Http/Controllers/HomeController.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ProcessMaker/Http/Controllers/HomeController.php b/ProcessMaker/Http/Controllers/HomeController.php index df81ab10f9..cdc7ea6a11 100644 --- a/ProcessMaker/Http/Controllers/HomeController.php +++ b/ProcessMaker/Http/Controllers/HomeController.php @@ -14,10 +14,15 @@ public function index(Request $request) if (Auth::check()) { // Redirect to home dynamic only if the package was enable if (hasPackage('package-dynamic-ui')) { - $user = \Auth::user(); - $homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user); + $user = Auth::user(); + $customDashboardExists = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::where('type', 'DASHBOARD') + ->count() > 0; - return redirect($homePage); + if ($customDashboardExists) { + $homePage = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user); + + return redirect($homePage); + } } // Redirect to the default view From e52e94aa126362917ffc779c2e5bf1a24229e95f Mon Sep 17 00:00:00 2001 From: CarliPinell Date: Wed, 11 Dec 2024 16:12:51 -0400 Subject: [PATCH 2/2] Ready for PR --- ProcessMaker/Http/Controllers/HomeController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ProcessMaker/Http/Controllers/HomeController.php b/ProcessMaker/Http/Controllers/HomeController.php index cdc7ea6a11..67a7b264d7 100644 --- a/ProcessMaker/Http/Controllers/HomeController.php +++ b/ProcessMaker/Http/Controllers/HomeController.php @@ -15,7 +15,10 @@ public function index(Request $request) // Redirect to home dynamic only if the package was enable if (hasPackage('package-dynamic-ui')) { $user = Auth::user(); + + // Check if there is at least one custom dashboard per user $customDashboardExists = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::where('type', 'DASHBOARD') + ->where('assignable_id', $user->id) ->count() > 0; if ($customDashboardExists) { @@ -26,7 +29,7 @@ public function index(Request $request) } // Redirect to the default view - return redirect('/requests'); + return redirect('/tasks'); } }