From 8d59cd9d839d32cb3e7823264529650b573c3be4 Mon Sep 17 00:00:00 2001 From: jekkos Date: Sat, 4 May 2024 01:10:38 +0200 Subject: [PATCH] Fix no_access route (#3984) --- app/Config/Routes.php | 4 ++-- app/Controllers/{No_Access.php => No_access.php} | 2 +- app/Controllers/Secure_Controller.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename app/Controllers/{No_Access.php => No_access.php} (94%) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 5861b0145..88e7a1eda 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -11,8 +11,8 @@ $routes->get('/', 'Login::index'); $routes->get('login', 'Login::index'); $routes->post('login', 'Login::index'); -$routes->add('no_access/(:any)', 'No_access::index/$1'); -$routes->add('no_access/(:any)/(:any)', 'No_access::index/$1/$2'); +$routes->add('no_access/index/(:segment)', 'No_access::index/$1'); +$routes->add('no_access/index/(:segment)/(:segment)', 'No_access::index/$1/$2'); $routes->add('sales/index/(:any)', 'Sales::manage/$1'); $routes->add('sales/index/(:any)/(:any)', 'Sales::manage/$1/$2'); diff --git a/app/Controllers/No_Access.php b/app/Controllers/No_access.php similarity index 94% rename from app/Controllers/No_Access.php rename to app/Controllers/No_access.php index 7c6c391d0..289051153 100644 --- a/app/Controllers/No_Access.php +++ b/app/Controllers/No_access.php @@ -10,7 +10,7 @@ use App\Models\Module; * * @property module module */ -class No_Access extends BaseController +class No_access extends BaseController { public function __construct() { diff --git a/app/Controllers/Secure_Controller.php b/app/Controllers/Secure_Controller.php index 99f0865f5..1f68fb31c 100644 --- a/app/Controllers/Secure_Controller.php +++ b/app/Controllers/Secure_Controller.php @@ -49,7 +49,7 @@ class Secure_Controller extends BaseController if(!$this->employee->has_module_grant($module_id, $logged_in_employee_info->person_id) || (isset($submodule_id) && !$this->employee->has_module_grant($submodule_id, $logged_in_employee_info->person_id))) { - redirect("no_access/$module_id/$submodule_id"); + return redirect()->to("no_access/$module_id/$submodule_id"); } // load up global global_view_data visible to all the loaded views