Admin : améliorer la liste des utilisateurs admin (#905)

* Admin user list: improve delete. Indicate if user is withdrawn. * Add lastLogin column * Make page visible to admin. Improve user name display
elefan-grenoble · Jul 4, 2023 · e15ce74 · e15ce74
1 parent 24ff993
commit e15ce74
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 42 deletions.
diff --git a/app/Resources/views/admin/index.html.twig b/app/Resources/views/admin/index.html.twig
@@ -146,6 +146,9 @@
                 <a href="{{ path("roles_list") }}" class="waves-effect waves-light btn deep-purple">
                     <i class="material-icons left">list</i>Liste des roles
                 </a>
+                <a href="{{ path("admin_users_list") }}" class="waves-effect waves-light btn deep-purple">
+                    <i class="material-icons left">list</i>Liste des utilisateurs admin
+                </a>
             {% endif %}
 
             {% if is_granted("ROLE_SUPER_ADMIN") %}
@@ -162,9 +165,6 @@
                 <a href="{{ path("user_install_admin") }}" class="waves-effect waves-light btn deep-purple">
                     <i class="material-icons left">add</i>Ajouter un admin
                 </a>
-                <a href="{{ path("admins_list") }}" class="waves-effect waves-light btn deep-purple">
-                    <i class="material-icons left">list</i>Liste des utilisateurs admin
-                </a>
 
                 <h6>Divers</h6>
                 <a href="{{ path("client_list") }}" class="waves-effect waves-light btn">

diff --git a/app/Resources/views/admin/user/admin_list.html.twig b/app/Resources/views/admin/user/admin_list.html.twig
@@ -13,42 +13,51 @@
 
     <table class="striped">
         <thead>
-        <tr>
-            <th data-col="m.member_number">#</th>
-            <th data-col="m.username">Username</th>
-            <th data-col="m.email">Email</th>
-            <th>Actions</th>
-        </tr>
+            <tr>
+                <th>Etat</th>
+                <th>Utilisateur</th>
+                <th>Email</th>
+                <th>Dernière connexion</th>
+                {% if is_granted("ROLE_SUPER_ADMIN") %}
+                    <th>Actions</th>
+                {% endif %}
+            </tr>
         </thead>
         <tbody>
-        {% for admin in admins %}
-            <tr>
-                <td>
-                    {% if admin.beneficiary %}
-                        <a href="{{ path('member_show', { 'member_number': admin.beneficiary.membership.memberNumber }) }}">
-                            {{ admin.beneficiary.membership.memberNumber }}
-                        </a>
-                    {% endif %}
-                </td>
-                <td>{{ admin.username }}</td>
-                <td>{{ admin.email }}</td>
-                <td>
-                    {{ form_start(delete_forms[admin.id]) }}
-                    {{ form_widget(delete_forms[admin.id]) }}
-                    {% if admin.beneficiary %}
-                        <a href="{{ path('user_remove_role', { 'id': admin.id, 'role': 'ROLE_ADMIN' }) }}" class="orange btn-floating small" title="Enlever le rôle">
-                            <i class="material-icons left">arrow_downward</i>
-                        </a>
-
+            {% for admin in admins %}
+                <tr>
+                    <td>
+                        {% if admin.beneficiary and admin.beneficiary.membership.withdrawn %}
+                            <i class="material-icons" title="Compte fermé">{{ member_withdrawn_material_icon }}</i>
+                        {% endif %}
+                    </td>
+                    <td>
+                        {% include "admin/member/_partial/member_or_user_link.html.twig" with { user: admin, target_blank: true } %}
+                    </td>
+                    <td>{{ admin.email }}</td>
+                    {% if admin.lastLogin %}
+                        <td title="{{ admin.lastLogin | date_fr_full_with_time }}">{{ admin.lastLogin | date_short }}</td>
                     {% else %}
-                        <button type="submit" class="btn-floating waves-effect waves-light red" title="⚠️ Supprimer l'utilisateur ⚠️">
-                            <i class="material-icons left">close</i>
-                        </button>
+                        <td></td>
                     {% endif %}
-                    {{ form_end(delete_forms[admin.id]) }}
-                </td>
-            </tr>
-        {% endfor %}
+                    {% if is_granted("ROLE_SUPER_ADMIN") %}
+                        <td>
+                            {{ form_start(delete_forms[admin.id]) }}
+                            {{ form_widget(delete_forms[admin.id]) }}
+                            {% if admin.beneficiary %}
+                                <a href="{{ path('user_remove_role', { 'id': admin.id, 'role': 'ROLE_ADMIN' }) }}" class="orange btn-floating small" title="Enlever le rôle">
+                                    <i class="material-icons left">arrow_downward</i>
+                                </a>
+                            {% else %}
+                                <a href="#" class="btn-floating waves-effect waves-light red" onclick="var r = confirm('Etes-vous sûr de vouloir supprimer cet utilisateur ?!'); if (r == true) {$(this).closest('form').submit();}; event.stopPropagation();" title="⚠️ Supprimer l'utilisateur ⚠️">
+                                    <i class="material-icons left">delete</i>
+                                </a>
+                            {% endif %}
+                            {{ form_end(delete_forms[admin.id]) }}
+                        </td>
+                    {% endif %}
+                </tr>
+            {% endfor %}
         </tbody>
     </table>
 {% endblock %}

diff --git a/src/AppBundle/Controller/AdminController.php b/src/AppBundle/Controller/AdminController.php
@@ -152,13 +152,12 @@ public function usersAction(Request $request, SearchUserFormHelper $formHelper)
     /**
      * Lists all users with ROLE_ADMIN.
      *
-     * @param Request $request , SearchUserFormHelper $formHelper
-     * @param SearchUserFormHelper $formHelper
+     * @param Request $request
      * @return Response
-     * @Route("/admin_users", name="admins_list", methods={"GET","POST"})
+     * @Route("/admin_users", name="admin_users_list", methods={"GET"})
      * @Security("has_role('ROLE_ADMIN')")
      */
-    public function adminUsersAction(Request $request, SearchUserFormHelper $formHelper)
+    public function adminUsersAction(Request $request)
     {
         $em = $this->getDoctrine()->getManager();
 

diff --git a/src/AppBundle/Controller/UserController.php b/src/AppBundle/Controller/UserController.php
@@ -305,20 +305,21 @@ public function removeClientUserAction(User $user, $client_id)
     /**
      * Deletes a user entity
      *
-     * @Route("/delete/{id}", name="user_delete", methods={"DELETE"})
+     * @Route("/{id}/delete", name="user_delete", methods={"DELETE"})
      * @Security("has_role('ROLE_SUPER_ADMIN')")
      * @param Request $request
      * @param User $user
      * @return \Symfony\Component\HttpFoundation\RedirectResponse
      */
     public function deleteAction(Request $request, User $user)
     {
+        $session = new Session();
+        $em = $this->getDoctrine()->getManager();
+
         $form = $this->createDeleteForm($user);
         $form->handleRequest($request);
 
-        $session = new Session();
         if ($form->isSubmitted() && $form->isValid()) {
-            $em = $this->getDoctrine()->getManager();
             $em->remove($user);
             $em->flush();
 

diff --git a/src/AppBundle/Entity/User.php b/src/AppBundle/Entity/User.php
@@ -356,4 +356,12 @@ public function getProcessUpdates()
     {
         return $this->processUpdates;
     }
+
+    /**
+     * @return DateTime
+     */
+    public function getLastLogin()
+    {
+        return $this->lastLogin;
+    }
 }