pkp#7495 Redirect to new dashboard instead of submissions, default to…

… first dashboard view if none is selected via query param
jardakotesovec · Oct 2, 2024 · 32a44a9 · 32a44a9
1 parent ebe9f29
commit 32a44a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/classes/template/PKPTemplateManager.php b/classes/template/PKPTemplateManager.php
@@ -990,7 +990,8 @@ public function setupBackendPage()
                                 $dashboardViews = Repo::submission()->getDashboardViews($request->getContext(), $request->getUser(), [Role::ROLE_ID_MANAGER, Role::ROLE_ID_SITE_ADMIN, Role::ROLE_ID_SUB_EDITOR, Role::ROLE_ID_ASSISTANT]);
                                 $requestedPage = $router->getRequestedPage($request);
                                 $requestedOp = $router->getRequestedOp($request);
-                                $requestedViewId = $request->getUserVar('currentViewId');
+                                $requestedViewId = $request->getUserVar('currentViewId') ?? $dashboardViews->keys()->first();
+
                                 $viewsData = $dashboardViews->map(function (DashboardView $dashboardView) use ($router, $request,$requestedOp, $requestedPage, $requestedViewId) { 
                                     $data = $dashboardView->getData();
                                     return [
@@ -1017,7 +1018,7 @@ public function setupBackendPage()
                                 $dashboardViews = Repo::submission()->getDashboardViews($request->getContext(), $request->getUser(), [Role::ROLE_ID_REVIEWER]);
                                 $requestedPage = $router->getRequestedPage($request);
                                 $requestedOp = $router->getRequestedOp($request);
-                                $requestedViewId = $request->getUserVar('currentViewId');
+                                $requestedViewId = $request->getUserVar('currentViewId') ?? $dashboardViews->keys()->first();
                                 $viewsData = $dashboardViews->map(function (DashboardView $dashboardView) use ($router, $request,$requestedOp, $requestedPage, $requestedViewId) { 
                                     $data = $dashboardView->getData();
                                     return [
@@ -1038,7 +1039,7 @@ public function setupBackendPage()
                                 $dashboardViews = Repo::submission()->getDashboardViews($request->getContext(), $request->getUser(), [Role::ROLE_ID_AUTHOR]);
                                 $requestedPage = $router->getRequestedPage($request);
                                 $requestedOp = $router->getRequestedOp($request);
-                                $requestedViewId = $request->getUserVar('currentViewId');
+                                $requestedViewId = $request->getUserVar('currentViewId') ?? $dashboardViews->keys()->first();
                                 $viewsData = $dashboardViews->map(function (DashboardView $dashboardView) use ($router, $request,$requestedOp, $requestedPage, $requestedViewId) { 
                                     $data = $dashboardView->getData();
                                     return [

diff --git a/pages/login/LoginHandler.php b/pages/login/LoginHandler.php
@@ -478,10 +478,7 @@ public function _redirectByURL($request)
      */
     protected function sendHome($request)
     {
-        if ($request->getContext()) {
-            $request->redirect(null, 'submissions');
-        } else {
-            $request->redirect(null, 'user');
-        }
+        $pkpPageRouter = $request->getRouter(); /** @var \PKP\core\PKPPageRouter $pkpPageRouter */
+        $pkpPageRouter->redirectHome($request);
     }
 }