From fadd26bd137becf1ad25ce79bc936ba292f7d316 Mon Sep 17 00:00:00 2001 From: imanghafoori Date: Tue, 2 Apr 2019 22:10:34 +0330 Subject: [PATCH] flatten code --- .../src/Providers/AdminServiceProvider.php | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index c8a59c1c4..270f3dc44 100755 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -69,27 +69,28 @@ class AdminServiceProvider extends ServiceProvider $allowedPermissions = auth()->guard('admin')->user()->role->permissions; foreach (config('menu.admin') as $index => $item) { - if (bouncer()->hasPermission($item['key'])) { - if($index+1 < count(config('menu.admin')) && $permissionType != 'all') { - $permission = config('menu.admin')[$index + 1]; + if (! bouncer()->hasPermission($item['key'])) { + continue; + } + if ($index + 1 < count(config('menu.admin')) && $permissionType != 'all') { + $permission = config('menu.admin')[$index + 1]; - if (substr_count($permission['key'], '.') == 2 && substr_count($item['key'], '.') == 1) { - foreach($allowedPermissions as $key => $value) { - if ($item['key'] == $value) { - $neededItem = $allowedPermissions[$key + 1]; + if (substr_count($permission['key'], '.') == 2 && substr_count($item['key'], '.') == 1) { + foreach ($allowedPermissions as $key => $value) { + if ($item['key'] == $value) { + $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']; } } } } } - - $tree->add($item, 'menu'); } + + $tree->add($item, 'menu'); } $tree->items = core()->sortItems($tree->items);