pagination testing
This commit is contained in:
@@ -33,7 +33,7 @@ class AdminController extends Controller
|
|||||||
|
|
||||||
foreach($usersArr as $user) {
|
foreach($usersArr as $user) {
|
||||||
$user->role = $user->getRole();
|
$user->role = $user->getRole();
|
||||||
$user->permissions = $user->getPermissionsArray();
|
$user['permissions'] = $user->getPermissionsArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
return view('admin.dashboards.userspaged')->with('usersArr', $usersArr);
|
return view('admin.dashboards.userspaged')->with('usersArr', $usersArr);
|
||||||
|
|||||||
@@ -119,18 +119,34 @@ class User extends Authenticatable
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function getPermissionsArray() {
|
public function getPermissionsArray() {
|
||||||
$perms = UserPermission::where([
|
$permCount = UserPermission::where([
|
||||||
'character_id' => $this->character_id,
|
'character_id' => $this->character_id,
|
||||||
])->get('permission')->toArray();
|
])->count();
|
||||||
|
|
||||||
return $perms;
|
if($permCount > 0) {
|
||||||
|
$perms = UserPermission::where([
|
||||||
|
'character_id' => $this->character_id,
|
||||||
|
])->get('permission')->toArray();
|
||||||
|
|
||||||
|
return $perms;
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getPermissions() {
|
public function getPermissions() {
|
||||||
$perms = UserPermission::where([
|
$permCount = UserPermission::where([
|
||||||
'character_id' => $this->character_id,
|
'character_id' => $this->character_id,
|
||||||
])->get('permission');
|
])->count();
|
||||||
|
|
||||||
return $perms;
|
if($permCount > 0) {
|
||||||
|
$perms = UserPermission::where([
|
||||||
|
'character_id' => $this->character_id,
|
||||||
|
])->get('permission');
|
||||||
|
|
||||||
|
return $perms;
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,9 +20,7 @@
|
|||||||
<td>{{ $user->role }}</td>
|
<td>{{ $user->role }}</td>
|
||||||
<td>
|
<td>
|
||||||
@if($user->permission)
|
@if($user->permission)
|
||||||
@foreach($user->permissions as $perm)
|
{{ $user->permission }}
|
||||||
{{ $perm . ", " }}
|
|
||||||
@endforeach
|
|
||||||
@else
|
@else
|
||||||
No Permissions
|
No Permissions
|
||||||
@endif
|
@endif
|
||||||
|
|||||||
Reference in New Issue
Block a user