Implement member removal functionality with user feedback in group views
This commit is contained in:
parent
7ed5cfcb83
commit
16cd905694
3 changed files with 61 additions and 51 deletions
|
@ -52,48 +52,51 @@
|
||||||
<h2>
|
<h2>
|
||||||
<i class="ri-group-2-fill"></i> Membres
|
<i class="ri-group-2-fill"></i> Membres
|
||||||
</h2>
|
</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>
|
<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>
|
</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 %}
|
{% if group.owner == user %}
|
||||||
<form method="post" action="{% url "group_add_member" pk=group.pk %}">
|
<form method="post" action="{% url "group_add_member" pk=group.pk %}">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
|
|
|
@ -32,7 +32,7 @@ urlpatterns = [
|
||||||
name="group_remove_game",
|
name="group_remove_game",
|
||||||
),
|
),
|
||||||
path(
|
path(
|
||||||
"group/<int:pk>/remove_membrer/<int:user_pk>/",
|
"group/<int:pk>/remove_membrer/",
|
||||||
views.GroupRemoveMemberView.as_view(),
|
views.GroupRemoveMemberView.as_view(),
|
||||||
name="group_remove_member",
|
name="group_remove_member",
|
||||||
),
|
),
|
||||||
|
|
|
@ -163,21 +163,28 @@ class GroupRemoveMusicView(MemberFilterMixin, SingleObjectMixin, View):
|
||||||
class GroupRemoveMemberView(OwnerFilterMixin, SingleObjectMixin, View):
|
class GroupRemoveMemberView(OwnerFilterMixin, SingleObjectMixin, View):
|
||||||
model = models.Group
|
model = models.Group
|
||||||
|
|
||||||
def get(self, request, pk, user_pk):
|
def post(self, request, pk):
|
||||||
group = self.get_object()
|
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(
|
messages.add_message(
|
||||||
request,
|
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:
|
else:
|
||||||
relation.delete()
|
relations.delete()
|
||||||
|
messages.add_message(
|
||||||
|
request,
|
||||||
|
messages.SUCCESS,
|
||||||
|
"Les membres sélectionnés ont été supprimées.",
|
||||||
|
)
|
||||||
|
|
||||||
return redirect(group)
|
return redirect(group)
|
||||||
|
|
||||||
|
@ -321,5 +328,5 @@ class GroupClearBlacklistView(OwnerFilterMixin, SingleObjectMixin, View):
|
||||||
def get(self, request, pk):
|
def get(self, request, pk):
|
||||||
group = self.get_object()
|
group = self.get_object()
|
||||||
group.musicvideo_set.filter(blacklisted=True).update(blacklisted=False)
|
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)
|
return redirect(group)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue