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)