Compare commits
No commits in common. "16cd9056940afe6f3e16ccea9018d61e12ad2ea1" and "094c5c104d893925f770f83fc0171e6bd668777f" have entirely different histories.
16cd905694
...
094c5c104d
3 changed files with 86 additions and 121 deletions
|
|
@ -52,51 +52,48 @@
|
||||||
<h2>
|
<h2>
|
||||||
<i class="ri-group-2-fill"></i> Membres
|
<i class="ri-group-2-fill"></i> Membres
|
||||||
</h2>
|
</h2>
|
||||||
<form method="post">
|
<table>
|
||||||
{% csrf_token %}
|
<thead>
|
||||||
<table>
|
<tr>
|
||||||
<thead>
|
<th>Membre</th>
|
||||||
<tr>
|
<th>
|
||||||
{% if group.owner == user %}<th></th>{% endif %}
|
<i class="ri-vip-crown-fill"></i>
|
||||||
<th>Membre</th>
|
</th>
|
||||||
|
<th>
|
||||||
|
<i class="ri-mv-line"></i>
|
||||||
|
</th>
|
||||||
|
{% if group.owner == user %}
|
||||||
<th>
|
<th>
|
||||||
<i class="ri-vip-crown-fill"></i>
|
<i class="ri-delete-bin-fill"></i>
|
||||||
</th>
|
</th>
|
||||||
<th>
|
{% endif %}
|
||||||
<i class="ri-mv-line"></i>
|
</tr>
|
||||||
</th>
|
</thead>
|
||||||
</tr>
|
<tbody>
|
||||||
</thead>
|
<tr>
|
||||||
<tbody>
|
<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>
|
||||||
{% if group.owner == user %}<td></td>{% endif %}
|
<td>{{ member }}</td>
|
||||||
<td>{{ group.owner }}</td>
|
<td></td>
|
||||||
<td>
|
<td>{{ member.count }}</td>
|
||||||
<i class="ri-vip-crown-fill owner"></i>
|
{% if group.owner == user %}
|
||||||
</td>
|
<td>
|
||||||
<td>{{ owner_count }}</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 %}
|
||||||
</tr>
|
</tr>
|
||||||
{% for member in members.all %}
|
{% endfor %}
|
||||||
<tr>
|
</tbody>
|
||||||
{% if group.owner == user %}
|
</table>
|
||||||
<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 %}
|
||||||
|
|
@ -117,31 +114,31 @@
|
||||||
<summary role="button">
|
<summary role="button">
|
||||||
<i class="ri-music-2-fill"></i> Liste des musiques
|
<i class="ri-music-2-fill"></i> Liste des musiques
|
||||||
</summary>
|
</summary>
|
||||||
<form method="post">
|
<table class="striped">
|
||||||
{% csrf_token %}
|
<thead>
|
||||||
<table class="striped">
|
<tr>
|
||||||
<thead>
|
<th>Musique</th>
|
||||||
|
<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>
|
<tr>
|
||||||
<th></th>
|
<th>{{ music.title }}</th>
|
||||||
<th>Musique</th>
|
<td>
|
||||||
<th>ID</th>
|
<a href="https://youtu.be/{{ music.yt_id }}">{{ music.yt_id }}</a>
|
||||||
<th>
|
</td>
|
||||||
<i class="ri-history-fill"></i>
|
<td>
|
||||||
</th>
|
<input type="checkbox" disabled {% if music.blacklisted %}checked{% endif %}
|
||||||
</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>
|
||||||
<td>
|
<td>
|
||||||
<input type="checkbox" disabled {% if music.blacklisted %}checked{% endif %}>
|
<a href="{% url "group_remove_music" pk=music.pk %}"><i class="ri-close-fill" alt="Supprimer"></i></a>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% empty %}
|
{% empty %}
|
||||||
|
|
@ -151,18 +148,12 @@
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
{% if musics %}
|
</details>
|
||||||
<button type="submit" formaction="{% url "group_remove_music" pk=group.pk %}">
|
<form method="post" action="{% url "group_add_music" pk=group.pk %}">
|
||||||
<i class="ri-delete-bin-fill"></i> Supprimer les musiques sélectionnées
|
{% csrf_token %}
|
||||||
</button>
|
<fieldset role="group">
|
||||||
{% endif %}
|
<input type="string" name="yt_id" id="yt_id" placeholder="Musique" required>
|
||||||
|
<button type="submit">Ajouter</button>
|
||||||
|
</fieldset>
|
||||||
</form>
|
</form>
|
||||||
</details>
|
{% endblock content %}
|
||||||
<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 %}
|
|
||||||
|
|
|
||||||
|
|
@ -27,12 +27,12 @@ urlpatterns = [
|
||||||
name="group_remove_music",
|
name="group_remove_music",
|
||||||
),
|
),
|
||||||
path(
|
path(
|
||||||
"group/<int:pk>/remove_game/",
|
"group/remove_game/<int:pk>/",
|
||||||
views.GroupRemoveGameView.as_view(),
|
views.GroupRemoveGameView.as_view(),
|
||||||
name="group_remove_game",
|
name="group_remove_game",
|
||||||
),
|
),
|
||||||
path(
|
path(
|
||||||
"group/<int:pk>/remove_membrer/",
|
"group/<int:pk>/remove_membrer/<int:user_pk>/",
|
||||||
views.GroupRemoveMemberView.as_view(),
|
views.GroupRemoveMemberView.as_view(),
|
||||||
name="group_remove_member",
|
name="group_remove_member",
|
||||||
),
|
),
|
||||||
|
|
|
||||||
|
|
@ -131,60 +131,34 @@ class GroupAddMemberView(OwnerFilterMixin, SingleObjectMixin, View):
|
||||||
return redirect(group)
|
return redirect(group)
|
||||||
|
|
||||||
|
|
||||||
class GroupRemoveMusicView(MemberFilterMixin, SingleObjectMixin, View):
|
class GroupRemoveMusicView(OwnerFilterMixin, SingleObjectMixin, View):
|
||||||
model = models.Group
|
model = models.MusicVideo
|
||||||
|
|
||||||
def post(self, request, pk):
|
def get(self, request, pk):
|
||||||
group = self.get_object()
|
music = self.get_object()
|
||||||
musics = group.musicvideo_set.filter(
|
group = music.group
|
||||||
owner=request.user, pk__in=request.POST.getlist("musics")
|
music.delete()
|
||||||
)
|
|
||||||
|
|
||||||
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)
|
return redirect(group)
|
||||||
|
|
||||||
|
|
||||||
class GroupRemoveMemberView(OwnerFilterMixin, SingleObjectMixin, View):
|
class GroupRemoveMemberView(OwnerFilterMixin, SingleObjectMixin, View):
|
||||||
model = models.Group
|
model = models.Group
|
||||||
|
|
||||||
def post(self, request, pk):
|
def get(self, request, pk, user_pk):
|
||||||
group = self.get_object()
|
group = self.get_object()
|
||||||
|
user = User.objects.get(pk=user_pk)
|
||||||
|
|
||||||
relations = models.Group.members.through.objects.filter(
|
relation = models.Group.members.through.objects.filter(
|
||||||
group=group, user__id__in=request.POST.getlist("member")
|
group=group, user=user
|
||||||
)
|
).first()
|
||||||
if relations.count() == 0:
|
if not relation:
|
||||||
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.WARNING,
|
messages.ERROR,
|
||||||
"Certains membres n'ont pas pu être supprimées.",
|
f"L'utilisateur {user} n'est pas membre du groupe.",
|
||||||
)
|
)
|
||||||
relations.delete()
|
|
||||||
else:
|
else:
|
||||||
relations.delete()
|
relation.delete()
|
||||||
messages.add_message(
|
|
||||||
request,
|
|
||||||
messages.SUCCESS,
|
|
||||||
"Les membres sélectionnés ont été supprimées.",
|
|
||||||
)
|
|
||||||
|
|
||||||
return redirect(group)
|
return redirect(group)
|
||||||
|
|
||||||
|
|
@ -328,5 +302,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é effacée.")
|
messages.add_message(request, messages.SUCCESS, "La blacklist a été vidée.")
|
||||||
return redirect(group)
|
return redirect(group)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue