diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index e1f0b27244..9624753b16 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -563,7 +563,7 @@ class UsersController extends Controller trans('general.accessories'), trans('general.consumables'), trans('general.groups'), - trans('general.permission_level'), + trans('general.permissions'), trans('general.notes'), trans('admin/users/table.activated'), trans('general.created_at'), @@ -580,10 +580,11 @@ class UsersController extends Controller $permissionstring = ""; - if(array_key_exists("superuser", json_decode($user->permissions, true))) { + + if($user->isSuperUser()) { $permissionstring = trans('general.superuser'); } - elseif(array_key_exists("admin", json_decode($user->permissions, true))) { + elseif($user->hasAccess('admin')) { $permissionstring = trans('general.admin'); } else { diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php index 6c8c0f4afe..ec0b8e6ee3 100644 --- a/resources/lang/en-US/general.php +++ b/resources/lang/en-US/general.php @@ -11,6 +11,9 @@ return [ 'activity_report' => 'Activity Report', 'address' => 'Address', 'admin' => 'Admin', + 'admin_tooltip' => 'This user has admin privileges', + 'superuser' => 'Superuser', + 'superuser_tooltip' => 'This user has superuser privileges', 'administrator' => 'Administrator', 'add_seats' => 'Added seats', 'age' => "Age", diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 7c73b1240c..00bfc84df8 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -167,7 +167,7 @@ @if (($user->isSuperUser()) || ($user->hasAccess('admin'))) -