From bd07382dd6421512aa33f60cee6cf027747cce64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Wed, 15 Jul 2020 14:14:20 +0300 Subject: [PATCH] fixed #1533 --- app/Abstracts/Http/Controller.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app/Abstracts/Http/Controller.php b/app/Abstracts/Http/Controller.php index 1a3a2c2f2..f366929d5 100644 --- a/app/Abstracts/Http/Controller.php +++ b/app/Abstracts/Http/Controller.php @@ -44,16 +44,20 @@ abstract class Controller extends BaseController $controller = ''; + // Add module + if (isset($arr[3]) && isset($arr[4])) { + if (strtolower($arr[4]) == 'modules') { + $controller .= Str::kebab($arr[3]) . '-'; + } elseif (isset($arr[5]) && (strtolower($arr[5]) == 'modules')) { + $controller .= Str::kebab($arr[4]) . '-'; + } + } + // Add folder if (strtolower($arr[1]) != 'controllers') { $controller .= Str::kebab($arr[1]) . '-'; } - // Add module - if (isset($arr[3]) && isset($arr[4]) && (strtolower($arr[4]) == 'modules')) { - $controller .= Str::kebab($arr[3]) . '-'; - } - // Add file $controller .= Str::kebab($arr[0]); @@ -63,6 +67,11 @@ abstract class Controller extends BaseController return; } + // App\Http\Controllers\FooBar -->> foo-bar + // App\Http\Controllers\FooBar\Main -->> foo-bar-main + // Modules\Blog\Http\Controllers\Posts -->> blog-posts + // Modules\Blog\Http\Controllers\Portal\Posts -->> blog-portal-posts + // Add CRUD permission check $this->middleware('permission:create-' . $controller)->only('create', 'store', 'duplicate', 'import'); $this->middleware('permission:read-' . $controller)->only('index', 'show', 'edit', 'export');