From 676e58c361b35187ac407409841477904eede8d9 Mon Sep 17 00:00:00 2001 From: Jonas Braathen Date: Fri, 15 May 2026 03:08:57 +0200 Subject: [PATCH] dnscms: use timezone aware date when filtering for future events --- dnscms/events/models.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dnscms/events/models.py b/dnscms/events/models.py index f338312..2df2194 100644 --- a/dnscms/events/models.py +++ b/dnscms/events/models.py @@ -209,9 +209,12 @@ class EventOrganizer(ClusterableModel): class EventPageQuerySet(PageQuerySet): def future(self): - today = timezone.localtime(timezone.now()).date() - next_occurrence = Min("occurrences__start", filter=Q(occurrences__start__gte=today)) - return self.filter(occurrences__start__gte=today).annotate(next_occurrence=next_occurrence) + now = timezone.now() + today_start = timezone.localtime(now).replace(hour=0, minute=0, second=0, microsecond=0) + next_occurrence = Min("occurrences__start", filter=Q(occurrences__start__gte=today_start)) + return self.filter(occurrences__start__gte=today_start).annotate( + next_occurrence=next_occurrence + ) EventPageManager = PageManager.from_queryset(EventPageQuerySet)