From d7459b3b83490cd023c589f33cc3205cb41f1705 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Tue, 6 Oct 2020 12:48:50 +0200 Subject: [PATCH] Fix years with 52 weeks --- src/pretix/presale/views/event.py | 2 +- src/pretix/presale/views/organizer.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py index 123cd6ea5..2821e51ee 100644 --- a/src/pretix/presale/views/event.py +++ b/src/pretix/presale/views/event.py @@ -467,7 +467,7 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView): context['days'] = days_for_template(ebd, week) context['weeks'] = [ (date.fromisocalendar(self.year, i + 1, 1), date.fromisocalendar(self.year, i + 1, 7)) - for i in range(53) + for i in range(53 if date(self.year, 12, 31)[0] == self.year else 52) ] context['years'] = range(now().year - 2, now().year + 3) context['week_format'] = get_format('WEEK_FORMAT') diff --git a/src/pretix/presale/views/organizer.py b/src/pretix/presale/views/organizer.py index fed4ae79f..1af92f828 100644 --- a/src/pretix/presale/views/organizer.py +++ b/src/pretix/presale/views/organizer.py @@ -522,7 +522,10 @@ class WeekCalendarView(OrganizerViewMixin, EventListMixin, TemplateView): ebd = self._events_by_day(before, after) ctx['days'] = days_for_template(ebd, week) - ctx['weeks'] = [(date.fromisocalendar(self.year, i + 1, 1), date.fromisocalendar(self.year, i + 1, 7)) for i in range(53)] + ctx['weeks'] = [ + (date.fromisocalendar(self.year, i + 1, 1), date.fromisocalendar(self.year, i + 1, 7)) + for i in range(53 if date(self.year, 12, 31)[0] == self.year else 52) + ] ctx['years'] = range(now().year - 2, now().year + 3) ctx['week_format'] = get_format('WEEK_FORMAT') if ctx['week_format'] == 'WEEK_FORMAT':