From 1e6579bedff68ab22f9160c2f4a0b7f4cbc9de60 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 5 Apr 2019 19:38:44 +0530 Subject: [PATCH] in fix --- packages/Webkul/Admin/src/Providers/AdminServiceProvider.php | 1 + .../Admin/src/Resources/views/layouts/nav-left.blade.php | 4 ---- packages/Webkul/User/src/Http/Middleware/Bouncer.php | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index 270f3dc44..d990730b0 100755 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -72,6 +72,7 @@ class AdminServiceProvider extends ServiceProvider if (! bouncer()->hasPermission($item['key'])) { continue; } + if ($index + 1 < count(config('menu.admin')) && $permissionType != 'all') { $permission = config('menu.admin')[$index + 1]; diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php index c492e4626..e5a14e54a 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php @@ -10,8 +10,4 @@ @endforeach - - {{--
- -
--}} \ No newline at end of file diff --git a/packages/Webkul/User/src/Http/Middleware/Bouncer.php b/packages/Webkul/User/src/Http/Middleware/Bouncer.php index e1d6a9ad4..aea2831b8 100755 --- a/packages/Webkul/User/src/Http/Middleware/Bouncer.php +++ b/packages/Webkul/User/src/Http/Middleware/Bouncer.php @@ -29,8 +29,6 @@ class Bouncer public function checkIfAuthorized($request) { - // dd(auth()->guard('admin')->user()->role); - if (! $role = auth()->guard('admin')->user()->role) abort(401, 'This action is unauthorized.');