fixed #1533

akaunting · Jul 15, 2020 · bd07382 · bd07382
1 parent a067866
commit bd07382
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/app/Abstracts/Http/Controller.php b/app/Abstracts/Http/Controller.php
@@ -44,16 +44,20 @@ public function setPermissions()
 
         $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 @@ public function setPermissions()
             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');