diff --git a/base/static/css/main.css b/base/static/css/main.css
index 1fb8b6e..a353d2e 100644
--- a/base/static/css/main.css
+++ b/base/static/css/main.css
@@ -19,21 +19,3 @@ i.owner {
.template {
display: none;
}
-
-a.group {
- text-decoration: none;
-}
-
-.group-owner, .group i {
- margin-left: .5em;
-}
-
-.group-owner {
- color: var(--pico-color-zinc-500);
-}
-
-.music-count {
- font-weight: 900;
- color: var(--pico-color-zinc-500);
- margin-left: .5em;
-}
diff --git a/game/templates/game/group_detail.html b/game/templates/game/group_detail.html
index 19b4121..d305efa 100644
--- a/game/templates/game/group_detail.html
+++ b/game/templates/game/group_detail.html
@@ -2,12 +2,7 @@
{% load form %}
{% block content %}
- {% if group.owner == user %}
-
- {% else %}
-
- {% endif %}
- {{ group.name }}
+ {{ group.name }}
{% if group.owner == user %}
@@ -26,11 +21,9 @@
| Date |
Joueurs |
- {% if group.owner == user %}
-
-
- |
- {% endif %}
+
+
+ |
{% for game in group.musikgame_set.all %}
@@ -39,11 +32,9 @@
{{ game.date }}
{{ game.players.all|join:", " }} |
- {% if group.owner == user %}
-
-
- |
- {% endif %}
+
+
+ |
{% endfor %}
@@ -52,6 +43,11 @@
Membres
+ {% if group.owner == user %}
+
+ Modifier les membres
+
+ {% endif %}
@@ -62,11 +58,9 @@
|
|
- {% if group.owner == user %}
-
-
- |
- {% endif %}
+
+
+ |
@@ -76,39 +70,35 @@
{{ owner_count }} |
- {% if group.owner == user %} | {% endif %}
+ |
{% for member in members.all %}
| {{ member }} |
|
{{ member.count }} |
- {% if group.owner == user %}
-
-
-
-
- |
- {% endif %}
+
+
+
+
+ |
{% endfor %}
- {% if group.owner == user %}
-
- {% endif %}
+
- Mes musiques {{ musics.count }}
+ Mes musiques ({{ musics.count }})
diff --git a/game/templates/game/home.html b/game/templates/game/home.html
index 20c310b..b726da8 100644
--- a/game/templates/game/home.html
+++ b/game/templates/game/home.html
@@ -7,18 +7,16 @@
{% endif %}
{% if user.owned_group_set.exists or user.group_set.exists %}
- {% for group in user.owned_group_set.all %}
-
-
- {{ group.name }}
-
-
- {% endfor %}
- {% for group in user.group_set.all %}
-
-
- {{ group.name }} {{ group.owner }}
-
-
- {% endfor %}
+
+ {% for group in user.owned_group_set.all %}
+ -
+ {{ group.name }}
+
+ {% endfor %}
+ {% for group in user.group_set.all %}
+ -
+ {{ group.name }}
+
+ {% endfor %}
+
{% endif %}
diff --git a/game/templates/game/musikgame_detail.html b/game/templates/game/musikgame_detail.html
index 91674ef..4d08293 100644
--- a/game/templates/game/musikgame_detail.html
+++ b/game/templates/game/musikgame_detail.html
@@ -13,7 +13,9 @@
Joueurs
- {{ musikgame.players.all|join:", " }}
+
+ {% for member in musikgame.players.all %}- {{ member }}
{% endfor %}
+
Musiques
diff --git a/game/urls.py b/game/urls.py
index 04c64e6..d55639b 100644
--- a/game/urls.py
+++ b/game/urls.py
@@ -10,6 +10,11 @@ urlpatterns = [
path(
"group//delete/", views.GroupDeleteView.as_view(), name="group_delete"
),
+ path(
+ "group//edit_members/",
+ views.GroupAddMembersView.as_view(),
+ name="group_edit_members",
+ ),
path("group//", views.GroupDetailView.as_view(), name="group_detail"),
path(
"group//add_music/",
diff --git a/game/views.py b/game/views.py
index 84b99cd..7713d26 100644
--- a/game/views.py
+++ b/game/views.py
@@ -70,6 +70,11 @@ class GroupDetailView(MemberFilterMixin, GroupMixin, DetailView):
return data
+class GroupAddMembersView(OwnerFilterMixin, GroupMixin, UpdateView):
+ fields = None
+ form_class = forms.GroupAddMembersForm
+
+
class GroupAddMusicView(MemberFilterMixin, SingleObjectMixin, View):
model = models.Group
@@ -113,12 +118,8 @@ class GroupRemoveMusicView(OwnerFilterMixin, SingleObjectMixin, View):
class GroupRemoveMemberView(View):
def get(self, request, pk, user_pk):
relation = get_object_or_404(
- models.Group.members.through,
- group_id=pk,
- user_id=user_pk,
- group__owner=request.user,
+ models.Group.members.through, group_id=pk, user_id=user_pk
)
-
group = relation.group
relation.delete()
return redirect(group)
@@ -219,14 +220,7 @@ class GameDetailView(LoginRequiredMixin, DetailView):
model = models.MusikGame
def get_queryset(self):
- return (
- super()
- .get_queryset()
- .filter(
- Q(group__members=self.request.user) | Q(group__owner=self.request.user)
- )
- .distinct()
- )
+ return super().get_queryset().filter(group__owner=self.request.user)
class YoutubeLoginView(LoginRequiredMixin, View):