From b1ae0240be92948fbc07b7554045191fbb8c123d Mon Sep 17 00:00:00 2001
From: "B.Fatih KOZ" <fatih.koz@gmail.com>
Date: Sun, 21 Aug 2022 17:59:19 +0300
Subject: [PATCH] Roles Update (#1474)

Adds member count to roles\index and member list to roles\edit pages.

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>
---
 app/Http/Controllers/Admin/RolesController.php |  6 ++++--
 resources/views/admin/roles/table.blade.php    |  4 +++-
 resources/views/admin/roles/users.blade.php    | 17 +++++++++++------
 3 files changed, 18 insertions(+), 9 deletions(-)

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 @@
 <table class="table table-hover table-responsive" id="roles-table">
   <thead>
   <th>Name</th>
-  <th></th>
+  <th class="text-center">Members</th>
+  <th class="text-right">Actions</th>
   </thead>
   <tbody>
   @foreach($roles as $role)
     <tr>
       <td>{{ $role->display_name }}</td>
+      <td class="text-center">{{ $role->users_count }}</td>
       <td class="text-right">
         {{ Form::open(['route' => ['admin.roles.destroy', $role->id], 'method' => 'delete']) }}
         <a href="{{ route('admin.roles.edit', [$role->id]) }}"
diff --git a/resources/views/admin/roles/users.blade.php b/resources/views/admin/roles/users.blade.php
index 8b201011..f746bde5 100644
--- a/resources/views/admin/roles/users.blade.php
+++ b/resources/views/admin/roles/users.blade.php
@@ -2,15 +2,20 @@
   <!-- Code Field -->
   <div class="form-group col-sm-12">
     <div class="form-container">
-      <h6><i class="fas fa-users"></i>
-        &nbsp;Users
+      <h6>
+        <i class="fas fa-users mr-2"></i>
+        @if($users_count > 0) {{ $users_count.' users are assigned to this role' }} @else No Users @endif
       </h6>
       <div class="form-container-body">
-        <div class="row">
-          <div class="col-sm-12">
-            TO DO
+        @if($users_count > 0)
+          <div class="row">
+            <div class="col-sm-12">
+              @foreach($users as $u)
+                &nbsp;&bull;&nbsp;<a href="{{ route('admin.users.edit', [$u->id]) }}">{{ $u->ident.' '.$u->name }}</a>
+              @endforeach
+            </div>
           </div>
-        </div>
+        @endif
       </div>
     </div>
   </div>