From 5346312ad01b60ab6eaafa227a1b206189465b06 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Sat, 30 Mar 2019 16:50:53 +0530 Subject: [PATCH] revising issue #705 --- .../src/Providers/AdminServiceProvider.php | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index 57bcce5f7..116d4ed4a 100755 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -69,21 +69,18 @@ class AdminServiceProvider extends ServiceProvider foreach (config('menu.admin') as $index => $item) { if (bouncer()->hasPermission($item['key'])) { - if($index+1 < count(config('menu.admin'))) { + if($index+1 < count(config('menu.admin')) && $allowedPermissions != 'all') { $permission = config('menu.admin')[$index + 1]; - if (substr_count($permission['key'], '.') == 2) { - if (substr_count($item['key'], '.') == 1) { + if (substr_count($permission['key'], '.') == 2 && substr_count($item['key'], '.') == 1) { + foreach($allowedPermissions as $key => $value) { + if ($item['key'] == $value) { + // dd($item['key'], $value); --> setting.users, settings.users + $neededItem = $allowedPermissions[$key + 1]; - foreach($allowedPermissions as $key => $value) { - if ($item['key'] == $value) { - // dd($item['key'], $value); --> setting.users, settings.users - $neededItem = $allowedPermissions[$key + 1]; - - foreach(config('menu.admin') as $key1 => $findMatced) { - if ($findMatced['key'] == $neededItem) { - $item['route'] = $findMatced['route']; - } + foreach(config('menu.admin') as $key1 => $findMatced) { + if ($findMatced['key'] == $neededItem) { + $item['route'] = $findMatced['route']; } } }