dnscms: use timezone aware date when filtering for future events
This commit is contained in:
@@ -209,9 +209,12 @@ class EventOrganizer(ClusterableModel):
|
|||||||
|
|
||||||
class EventPageQuerySet(PageQuerySet):
|
class EventPageQuerySet(PageQuerySet):
|
||||||
def future(self):
|
def future(self):
|
||||||
today = timezone.localtime(timezone.now()).date()
|
now = timezone.now()
|
||||||
next_occurrence = Min("occurrences__start", filter=Q(occurrences__start__gte=today))
|
today_start = timezone.localtime(now).replace(hour=0, minute=0, second=0, microsecond=0)
|
||||||
return self.filter(occurrences__start__gte=today).annotate(next_occurrence=next_occurrence)
|
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)
|
EventPageManager = PageManager.from_queryset(EventPageQuerySet)
|
||||||
|
|||||||
Reference in New Issue
Block a user