Refactor group detail and musikgame detail templates for improved owner visibility and styling; update CSS for music count display

This commit is contained in:
Edgar P. Burkhart 2025-06-14 00:11:39 +02:00
parent 43ba52f31e
commit 78e5be580b
Signed by: edpibu
GPG key ID: 9833D3C5A25BD227
5 changed files with 64 additions and 49 deletions

View file

@ -70,11 +70,6 @@ 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
@ -118,8 +113,12 @@ 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
models.Group.members.through,
group_id=pk,
user_id=user_pk,
group__owner=request.user,
)
group = relation.group
relation.delete()
return redirect(group)
@ -220,7 +219,14 @@ class GameDetailView(LoginRequiredMixin, DetailView):
model = models.MusikGame
def get_queryset(self):
return super().get_queryset().filter(group__owner=self.request.user)
return (
super()
.get_queryset()
.filter(
Q(group__members=self.request.user) | Q(group__owner=self.request.user)
)
.distinct()
)
class YoutubeLoginView(LoginRequiredMixin, View):