From 1cdbf0a96596178a0a98336d4cecc2fec187717d Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 2 Dec 2017 14:07:12 +0300 Subject: [PATCH] fixed #97 --- app/Http/Controllers/Auth/Users.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Auth/Users.php b/app/Http/Controllers/Auth/Users.php index b4c759aa9..57e75bec8 100644 --- a/app/Http/Controllers/Auth/Users.php +++ b/app/Http/Controllers/Auth/Users.php @@ -34,7 +34,9 @@ class Users extends Controller */ public function create() { - $roles = Role::all(); + $roles = Role::all()->reject(function($r) { + return $r->hasPermission('read-customer-panel'); + }); $companies = Auth::user()->companies()->get()->sortBy('name'); foreach ($companies as $company) { @@ -84,7 +86,17 @@ class Users extends Controller */ public function edit(User $user) { - $roles = Role::all(); + if ($user->customer) { + // Show only roles with customer permission + $roles = Role::all()->reject(function($r) { + return !$r->hasPermission('read-customer-panel'); + }); + } else { + // Don't show roles with customer permission + $roles = Role::all()->reject(function($r) { + return $r->hasPermission('read-customer-panel'); + }); + } $companies = Auth::user()->companies()->get()->sortBy('name'); foreach ($companies as $company) {