diff --git a/app/Http/Controllers/Admin/RolesController.php b/app/Http/Controllers/Admin/RolesController.php index cdfdae29..113b37ee 100644 --- a/app/Http/Controllers/Admin/RolesController.php +++ b/app/Http/Controllers/Admin/RolesController.php @@ -48,7 +48,7 @@ class RolesController extends Controller public function index(Request $request) { $this->rolesRepo->pushCriteria(new RequestCriteria($request)); - $roles = $this->rolesRepo->findWhere(['read_only' => false]); + $roles = $this->rolesRepo->withCount('users')->findWhere(['read_only' => false]); return view('admin.roles.index', [ 'roles' => $roles, @@ -117,7 +117,7 @@ class RolesController extends Controller */ public function edit($id) { - $role = $this->rolesRepo->findWithoutFail($id); + $role = $this->rolesRepo->withCount('users')->with('users')->findWithoutFail($id); if (empty($role)) { Flash::error('Role not found'); @@ -126,6 +126,8 @@ class RolesController extends Controller return view('admin.roles.edit', [ 'role' => $role, + 'users' => $role->users, + 'users_count' => $role->users_count, 'permissions' => $this->permsRepo->all(), ]); } diff --git a/resources/views/admin/roles/table.blade.php b/resources/views/admin/roles/table.blade.php index c7f997d6..6a35d831 100644 --- a/resources/views/admin/roles/table.blade.php +++ b/resources/views/admin/roles/table.blade.php @@ -1,12 +1,14 @@
Name | -+ | Members | +Actions | @foreach($roles as $role)
---|---|---|
{{ $role->display_name }} | +{{ $role->users_count }} |
{{ Form::open(['route' => ['admin.roles.destroy', $role->id], 'method' => 'delete']) }}
-
- Users
+
-
- TO DO
+ @if($users_count > 0)
+
+ @endif
+
-
+ @foreach($users as $u)
+ • {{ $u->ident.' '.$u->name }}
+ @endforeach
+
|