pagination testing
This commit is contained in:
@@ -33,9 +33,9 @@ class AdminController extends Controller
|
|||||||
|
|
||||||
foreach($usersArr as $user) {
|
foreach($usersArr as $user) {
|
||||||
$user->role = $user->getRole();
|
$user->role = $user->getRole();
|
||||||
$perms = $user->getPermissionsArray();
|
$perms = $user->getPermissionsString();
|
||||||
if($perms != null) {
|
if($perms != null) {
|
||||||
$user->permission = implode(', ', $perms);
|
$user->permission = $perms;
|
||||||
} else {
|
} else {
|
||||||
$user->permission = 'No Permissions';
|
$user->permission = 'No Permissions';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -118,7 +118,9 @@ class User extends Authenticatable
|
|||||||
return $role->role;
|
return $role->role;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getPermissionsArray() {
|
public function getPermissionsString() {
|
||||||
|
$permString = null;
|
||||||
|
|
||||||
$permCount = UserPermission::where([
|
$permCount = UserPermission::where([
|
||||||
'character_id' => $this->character_id,
|
'character_id' => $this->character_id,
|
||||||
])->count();
|
])->count();
|
||||||
@@ -128,7 +130,9 @@ class User extends Authenticatable
|
|||||||
'character_id' => $this->character_id,
|
'character_id' => $this->character_id,
|
||||||
])->get('permission')->toArray();
|
])->get('permission')->toArray();
|
||||||
|
|
||||||
return $perms[0];
|
foreach($perms as $perm) {
|
||||||
|
$permString = implode(', ', $perm);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user