From d6b82223717780a9317de9b17d088d65081b8413 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 11 Feb 2022 12:48:30 -0800 Subject: [PATCH] Refactor to combine permissions Signed-off-by: snipe --- app/Providers/AuthServiceProvider.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index a8e5a6245b..6352e65dcb 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -179,18 +179,12 @@ class AuthServiceProvider extends ServiceProvider // to the logged in API user, but creating assets, licenses, etc won't work // if the user can't view and interact with the select lists. Gate::define('view.selectlists', function ($user) { - return $user->can('update', Asset::class) - || $user->can('create', Asset::class) - || $user->can('update', License::class) - || $user->can('create', License::class) - || $user->can('update', Component::class) - || $user->can('create', Component::class) - || $user->can('update', Consumable::class) - || $user->can('create', Consumable::class) - || $user->can('update', Accessory::class) - || $user->can('create', Accessory::class) - || $user->can('update', User::class) - || $user->can('create', User::class); + return $user->can(['create','update'], Asset::class) + || $user->can(['create','update'], License::class) + || $user->can(['create','update'], Component::class) + || $user->can(['create','update'], Consumable::class) + || $user->can(['create','update'], Accessory::class) + || $user->can(['create','update'], User::class); }); } }