CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-09 15:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix calendar before-date to check for events (#5608)

Browse Source
This commit is contained in:
Richard Schreiber
2025-11-17 16:39:20 +01:00
committed by GitHub
parent 8c01cad06b
commit 818bb76e89
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/presale/views/event.py
View File

@@ -689,7 +689,7 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
self._set_month_year() self._set_month_year()
tz = self.request.event.timezone tz = self.request.event.timezone
_, ndays = calendar.monthrange(self.year, self.month) _, ndays = calendar.monthrange(self.year, self.month)
before = datetime(self.year, self.month, 1, 0, 0, 0, tzinfo=tz) - timedelta(days=1) before = datetime(self.year, self.month, 1, 23, 59, 59, tzinfo=tz) - timedelta(days=1)
after = datetime(self.year, self.month, ndays, 0, 0, 0, tzinfo=tz) + timedelta(days=1) after = datetime(self.year, self.month, ndays, 0, 0, 0, tzinfo=tz) + timedelta(days=1)
if self.request.event.settings.event_calendar_future_only: if self.request.event.settings.event_calendar_future_only:
@@ -750,7 +750,7 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
tz = self.request.event.timezone tz = self.request.event.timezone
week = isoweek.Week(self.year, self.week) week = isoweek.Week(self.year, self.week)
before = datetime( before = datetime(
week.monday().year, week.monday().month, week.monday().day, 0, 0, 0, tzinfo=tz week.monday().year, week.monday().month, week.monday().day, 23, 59, 59, tzinfo=tz
) - timedelta(days=1) ) - timedelta(days=1)
after = datetime( after = datetime(
week.sunday().year, week.sunday().month, week.sunday().day, 0, 0, 0, tzinfo=tz week.sunday().year, week.sunday().month, week.sunday().day, 0, 0, 0, tzinfo=tz

6
src/pretix/presale/views/organizer.py
View File

@@ -768,7 +768,7 @@ class CalendarView(OrganizerViewMixin, EventListMixin, TemplateView):
raise Http404() raise Http404()
tz = get_current_timezone() tz = get_current_timezone()
before = datetime(self.year, self.month, 1, 0, 0, 0, tzinfo=tz) - timedelta(days=1) before = datetime(self.year, self.month, 1, 23, 59, 59, tzinfo=tz) - timedelta(days=1)
after = datetime(self.year, self.month, ndays, 0, 0, 0, tzinfo=tz) + timedelta(days=1) after = datetime(self.year, self.month, ndays, 0, 0, 0, tzinfo=tz) + timedelta(days=1)
ctx['date'] = date(self.year, self.month, 1) ctx['date'] = date(self.year, self.month, 1)
@@ -854,7 +854,7 @@ class WeekCalendarView(OrganizerViewMixin, EventListMixin, TemplateView):
tz = get_current_timezone() tz = get_current_timezone()
week = isoweek.Week(self.year, self.week) week = isoweek.Week(self.year, self.week)
before = datetime( before = datetime(
week.monday().year, week.monday().month, week.monday().day, 0, 0, 0, tzinfo=tz, week.monday().year, week.monday().month, week.monday().day, 23, 59, 59, tzinfo=tz,
) - timedelta(days=1) ) - timedelta(days=1)
after = datetime( after = datetime(
week.sunday().year, week.sunday().month, week.sunday().day, 0, 0, 0, tzinfo=tz, week.sunday().year, week.sunday().month, week.sunday().day, 0, 0, 0, tzinfo=tz,
@@ -1001,7 +1001,7 @@ class DayCalendarView(OrganizerViewMixin, EventListMixin, TemplateView):
tz = get_current_timezone() tz = get_current_timezone()
before = datetime( before = datetime(
self.date.year, self.date.month, self.date.day, 0, 0, 0, tzinfo=tz, self.date.year, self.date.month, self.date.day, 23, 59, 59, tzinfo=tz,
) - timedelta(days=1) ) - timedelta(days=1)
after = datetime( after = datetime(
self.date.year, self.date.month, self.date.day, 0, 0, 0, tzinfo=tz, self.date.year, self.date.month, self.date.day, 0, 0, 0, tzinfo=tz,