diff --git a/app/Http/Controllers/Dashboard/AdminController.php b/app/Http/Controllers/Dashboard/AdminController.php index edc2c8463..eb7bd6111 100644 --- a/app/Http/Controllers/Dashboard/AdminController.php +++ b/app/Http/Controllers/Dashboard/AdminController.php @@ -33,9 +33,9 @@ class AdminController extends Controller foreach($usersArr as $user) { $user->role = $user->getRole(); - $perms = $user->getPermissionsArray(); + $perms = $user->getPermissionsString(); if($perms != null) { - $user->permission = implode(', ', $perms); + $user->permission = $perms; } else { $user->permission = 'No Permissions'; } diff --git a/app/Models/User/User.php b/app/Models/User/User.php index b348efc7f..515a677fa 100644 --- a/app/Models/User/User.php +++ b/app/Models/User/User.php @@ -118,7 +118,9 @@ class User extends Authenticatable return $role->role; } - public function getPermissionsArray() { + public function getPermissionsString() { + $permString = null; + $permCount = UserPermission::where([ 'character_id' => $this->character_id, ])->count(); @@ -128,7 +130,9 @@ class User extends Authenticatable 'character_id' => $this->character_id, ])->get('permission')->toArray(); - return $perms[0]; + foreach($perms as $perm) { + $permString = implode(', ', $perm); + } } else { return null; }