pagination testing

This commit is contained in:
2019-10-29 00:03:21 -05:00
parent a19a756750
commit 8c972a140b
2 changed files with 5 additions and 15 deletions

View File

@@ -32,17 +32,8 @@ class AdminController extends Controller
$usersArr = User::orderBy('name', 'asc')->paginate(50); $usersArr = User::orderBy('name', 'asc')->paginate(50);
foreach($usersArr as $user) { foreach($usersArr as $user) {
$role = UserRole::where([ $user->role = $user->getRole();
'character_id' => $user->character_id, $user->permissions = $user->getPermissionsArray();
])->get();
$perms = UserPermission::where([
'character_id' => $user->character_id,
])->get('permission')->toArray();
//Setup the extra stuff needed
$user->role = $role;
$user->permissions = $perms;
} }
return view('admin.dashboards.userspaged')->with('usersArr', $usersArr); return view('admin.dashboards.userspaged')->with('usersArr', $usersArr);

View File

@@ -17,11 +17,10 @@
@foreach($usersArr as $user) @foreach($usersArr as $user)
<tr> <tr>
<td>{{ $user->name }}</td> <td>{{ $user->name }}</td>
<td>{{ $user->getRole() }}</td> <td>{{ $user->role }}</td>
<td> <td>
{!! $perms = $user->getPermissionsArray() !!} @if($user->permission)
@if($perms != null) @foreach($user->permissions as $perm)
@foreach($perms as $perm)
{{ implode(', ', $perm) }} {{ implode(', ', $perm) }}
@endforeach @endforeach
@else @else