edpibu/musik
edpibu/musik
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages 1 Wiki Activity Actions

Implement member removal functionality with user feedback in group views

Browse source
This commit is contained in:
Edgar P. Burkhart 2025-06-14 12:15:18 +02:00
parent 7ed5cfcb83
commit 16cd905694
Signed by: edpibu
GPG key ID: 9833D3C5A25BD227
3 changed files with 61 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

83
game/templates/game/group_detail.html
View file

@ -52,48 +52,51 @@
<h2>
<i class="ri-group-2-fill"></i> Membres
</h2>
<table>
<thead>
<tr>
<th>Membre</th>
<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 %}
<form method="post">
{% csrf_token %}
<table>
<thead>
<tr>
<td>{{ member }}</td>
<td></td>
<td>{{ member.count }}</td>
{% if group.owner == user %}
<td>
<a href="{% url "group_remove_member" pk=group.pk user_pk=member.pk %}">
<i class="ri-close-fill" alt="Supprimer"></i>
</a>
</td>
{% endif %}
{% if group.owner == user %}<th></th>{% endif %}
<th>Membre</th>
<th>
<i class="ri-vip-crown-fill"></i>
</th>
<th>
<i class="ri-mv-line"></i>
</th>
</tr>
{% endfor %}
</tbody>
</table>
</thead>
<tbody>
<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 %}

2
game/urls.py
View file

@ -32,7 +32,7 @@ urlpatterns = [
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",
),

27
game/views.py
View file

@ -163,21 +163,28 @@ class GroupRemoveMusicView(MemberFilterMixin, SingleObjectMixin, View):
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(
group=group, user=user
).first()
if not relation:
relations = models.Group.members.through.objects.filter(
group=group, user__id__in=request.POST.getlist("member")
)
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,
f"L'utilisateur {user} n'est pas membre du groupe.",
messages.WARNING,
"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)
@ -321,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)