From f6c4c732d6971ad8248843e186eff23f78a37686 Mon Sep 17 00:00:00 2001 From: "Casper V. Kristensen" Date: Fri, 17 Apr 2020 08:58:18 +0200 Subject: [PATCH] Fix raid events mis-ordered due to not calling superclass's get_queryset() method. --- drakul/raids/views.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drakul/raids/views.py b/drakul/raids/views.py index 8b0d56e..3b67067 100644 --- a/drakul/raids/views.py +++ b/drakul/raids/views.py @@ -19,6 +19,7 @@ User = get_user_model() class RaidCalendar(MonthArchiveView): + queryset = Raid.objects.all() allow_empty = True allow_future = True date_field = "date" @@ -27,11 +28,12 @@ class RaidCalendar(MonthArchiveView): template_name_suffix = "_calendar" def get_queryset(self): - if not self.request.user.is_authenticated: - return Raid.objects.all() - return Raid.objects.annotate( - max_status=Max("responses__status", filter=Q(responses__character__user=self.request.user)) - ) + queryset = super().get_queryset() + if self.request.user.is_authenticated: + queryset = queryset.annotate( + max_status=Max("responses__status", filter=Q(responses__character__user=self.request.user)) + ) + return queryset def get_dated_queryset(self, **lookup): """