Implement member removal functionality with user feedback in group views

game/templates/game/group_detail.html

@@ -52,48 +52,51 @@
     <h2>
         <i class="ri-group-2-fill"></i> Membres
     </h2>
-    <table>
+    <form method="post">
-        <thead>
+        {% csrf_token %}
-            <tr>
+        <table>
-                <th>Membre</th>
+            <thead>
-                <th>
-                    <i class="ri-vip-crown-fill"></i>
-                </th>
-                <th>
-                    <i class="ri-mv-line"></i>
-                </th>
-                {% if group.owner == user %}
-                    <th>
-                        <i class="ri-delete-bin-fill"></i>
-                    </th>
-                {% endif %}
-            </tr>
-        </thead>
-        <tbody>
-            <tr>
-                <td>{{ group.owner }}</td>
-                <td>
-                    <i class="ri-vip-crown-fill owner"></i>
-                </td>
-                <td>{{ owner_count }}</td>
-                {% if group.owner == user %}<td></td>{% endif %}
-            </tr>
-            {% for member in members.all %}
                 <tr>
-                    <td>{{ member }}</td>
+                    {% if group.owner == user %}<th></th>{% endif %}
-                    <td></td>
+                    <th>Membre</th>
-                    <td>{{ member.count }}</td>
+                    <th>
-                    {% if group.owner == user %}
+                        <i class="ri-vip-crown-fill"></i>
-                        <td>
+                    </th>
-                            <a href="{% url "group_remove_member" pk=group.pk user_pk=member.pk %}">
+                    <th>
-                                <i class="ri-close-fill" alt="Supprimer"></i>
+                        <i class="ri-mv-line"></i>
-                            </a>
+                    </th>
-                        </td>
-                    {% endif %}
                 </tr>
-            {% endfor %}
+            </thead>
-        </tbody>
+            <tbody>
-    </table>
+                <tr>
+                    {% if group.owner == user %}<td></td>{% endif %}
+                    <td>{{ group.owner }}</td>
+                    <td>
+                        <i class="ri-vip-crown-fill owner"></i>
+                    </td>
+                    <td>{{ owner_count }}</td>
+                </tr>
+                {% for member in members.all %}
+                    <tr>
+                        {% if group.owner == user %}
+                            <td>
+                                <input type="checkbox" name="member" value="{{ member.pk }}">
+                            </td>
+                        {% endif %}
+                        <td>{{ member }}</td>
+                        <td></td>
+                        <td>{{ member.count }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+        {% if musics %}
+            <button type="submit"
+                    formaction="{% url "group_remove_member" pk=group.pk %}">
+                <i class="ri-delete-bin-fill"></i> Supprimer les membres sélectionnés
+            </button>
+        {% endif %}
+    </form>
     {% if group.owner == user %}
         <form method="post" action="{% url "group_add_member" pk=group.pk %}">
             {% csrf_token %}
@@ -114,31 +117,31 @@
         <summary role="button">
             <i class="ri-music-2-fill"></i> Liste des musiques
         </summary>
-        <table class="striped">
+        <form method="post">
-            <thead>
+            {% csrf_token %}
-                <tr>
+            <table class="striped">
-                    <th>Musique</th>
+                <thead>
-                    <th>ID</th>
-                    <th>
-                        <i class="ri-history-fill"></i>
-                    </th>
-                    <th>
-                        <i class="ri-delete-bin-fill"></i>
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for music in musics %}
                     <tr>
-                        <th>{{ music.title }}</th>
+                        <th></th>
-                        <td>
+                        <th>Musique</th>
-                            <a href="https://youtu.be/{{ music.yt_id }}">{{ music.yt_id }}</a>
+                        <th>ID</th>
-                        </td>
+                        <th>
-                        <td>
+                            <i class="ri-history-fill"></i>
-                            <input type="checkbox" disabled {% if music.blacklisted %}checked{% endif %}
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for music in musics %}
+                        <tr>
+                            <td>
+                                <input type="checkbox" name="musics" value="{{ music.pk }}">
+                            </td>
+                            <th>{{ music.title }}</th>
+                            <td>
+                                <a href="https://youtu.be/{{ music.yt_id }}">{{ music.yt_id }}</a>
                             </td>
                             <td>
-                                <a href="{% url "group_remove_music" pk=music.pk %}"><i class="ri-close-fill" alt="Supprimer"></i></a>
+                                <input type="checkbox" disabled {% if music.blacklisted %}checked{% endif %}>
                             </td>
                         </tr>
                     {% empty %}
@@ -148,12 +151,18 @@
                     {% endfor %}
                 </tbody>
             </table>
-        </details>
+            {% if musics %}
-        <form method="post" action="{% url "group_add_music" pk=group.pk %}">
+                <button type="submit" formaction="{% url "group_remove_music" pk=group.pk %}">
-            {% csrf_token %}
+                    <i class="ri-delete-bin-fill"></i> Supprimer les musiques sélectionnées
-            <fieldset role="group">
+                </button>
-                <input type="string" name="yt_id" id="yt_id" placeholder="Musique" required>
+            {% endif %}
-                <button type="submit">Ajouter</button>
-            </fieldset>
         </form>
-    {% endblock content %}
+    </details>
+    <form method="post" action="{% url "group_add_music" pk=group.pk %}">
+        {% csrf_token %}
+        <fieldset role="group">
+            <input type="string" name="yt_id" id="yt_id" placeholder="Musique" required>
+            <button type="submit">Ajouter</button>
+        </fieldset>
+    </form>
+{% endblock content %}

game/urls.py

@@ -27,12 +27,12 @@ urlpatterns = [
         name="group_remove_music",
     ),
     path(
-        "group/remove_game/<int:pk>/",
+        "group/<int:pk>/remove_game/",
         views.GroupRemoveGameView.as_view(),
         name="group_remove_game",
     ),
     path(
-        "group/<int:pk>/remove_membrer/<int:user_pk>/",
+        "group/<int:pk>/remove_membrer/",
         views.GroupRemoveMemberView.as_view(),
         name="group_remove_member",
     ),

game/views.py

@@ -131,34 +131,60 @@ class GroupAddMemberView(OwnerFilterMixin, SingleObjectMixin, View):
         return redirect(group)
 
 
-class GroupRemoveMusicView(OwnerFilterMixin, SingleObjectMixin, View):
+class GroupRemoveMusicView(MemberFilterMixin, SingleObjectMixin, View):
-    model = models.MusicVideo
+    model = models.Group
 
-    def get(self, request, pk):
+    def post(self, request, pk):
-        music = self.get_object()
+        group = self.get_object()
-        group = music.group
+        musics = group.musicvideo_set.filter(
-        music.delete()
+            owner=request.user, pk__in=request.POST.getlist("musics")
+        )
+
+        if musics.count() == 0:
+            messages.add_message(request, messages.INFO, "Aucune musique supprimée.")
+            return redirect(group)
+        if musics.count() != len(request.POST.getlist("musics")):
+            messages.add_message(
+                request,
+                messages.WARNING,
+                "Certaines musiques n'ont pas pu être supprimées.",
+            )
+            musics.delete()
+        else:
+            musics.delete()
+            messages.add_message(
+                request,
+                messages.SUCCESS,
+                "Les musiques sélectionnées ont été supprimées.",
+            )
         return redirect(group)
 
 
 class GroupRemoveMemberView(OwnerFilterMixin, SingleObjectMixin, View):
     model = models.Group
 
-    def get(self, request, pk, user_pk):
+    def post(self, request, pk):
         group = self.get_object()
-        user = User.objects.get(pk=user_pk)
 
-        relation = models.Group.members.through.objects.filter(
+        relations = models.Group.members.through.objects.filter(
-            group=group, user=user
+            group=group, user__id__in=request.POST.getlist("member")
-        ).first()
+        )
-        if not relation:
+        if relations.count() == 0:
+            messages.add_message(request, messages.INFO, "Aucun membre supprimé.")
+        if relations.count() != len(request.POST.getlist("member")):
             messages.add_message(
                 request,
-                messages.ERROR,
+                messages.WARNING,
-                f"L'utilisateur {user} n'est pas membre du groupe.",
+                "Certains membres n'ont pas pu être supprimées.",
             )
+            relations.delete()
         else:
-            relation.delete()
+            relations.delete()
+            messages.add_message(
+                request,
+                messages.SUCCESS,
+                "Les membres sélectionnés ont été supprimées.",
+            )
 
         return redirect(group)
 
@@ -302,5 +328,5 @@ class GroupClearBlacklistView(OwnerFilterMixin, SingleObjectMixin, View):
     def get(self, request, pk):
         group = self.get_object()
         group.musicvideo_set.filter(blacklisted=True).update(blacklisted=False)
-        messages.add_message(request, messages.SUCCESS, "La blacklist a été vidée.")
+        messages.add_message(request, messages.SUCCESS, "La blacklist a été effacée.")
         return redirect(group)