From 9fdef5eb5d73bd8eb48f7486b7097e18eae96e96 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Wed, 7 Mar 2018 12:09:01 +0100 Subject: [PATCH] Show date range of event series in list of events --- .../templates/pretixpresale/organizers/index.html | 2 +- src/pretix/presale/views/organizer.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/pretix/presale/templates/pretixpresale/organizers/index.html b/src/pretix/presale/templates/pretixpresale/organizers/index.html index 14fce5205..85c62aca1 100644 --- a/src/pretix/presale/templates/pretixpresale/organizers/index.html +++ b/src/pretix/presale/templates/pretixpresale/organizers/index.html @@ -53,7 +53,7 @@ {{ e.name }} - {{ e.get_date_range_display }} + {{ e.daterange|default:e.get_date_range_display }} diff --git a/src/pretix/presale/views/organizer.py b/src/pretix/presale/views/organizer.py index d2933f643..49bc01f7c 100644 --- a/src/pretix/presale/views/organizer.py +++ b/src/pretix/presale/views/organizer.py @@ -18,6 +18,7 @@ from pretix.base.i18n import language from pretix.base.models import ( Event, EventMetaValue, SubEvent, SubEventMetaValue, ) +from pretix.helpers.daterange import daterange from pretix.multidomain.urlreverse import eventreverse from pretix.presale.ical import get_ical from pretix.presale.views import OrganizerViewMixin @@ -130,6 +131,17 @@ class OrganizerIndex(OrganizerViewMixin, ListView): qs = filter_qs_by_attr(qs, self.request) return qs + def get_context_data(self, **kwargs): + ctx = super().get_context_data(**kwargs) + for event in ctx['events']: + tz = pytz.timezone(event.cache.get_or_set('timezone', lambda: event.settings.timezone)) + if event.has_subevents: + event.daterange = daterange( + event.min_from.astimezone(tz), + (event.max_fromto or event.max_to or event.max_from).astimezone(tz) + ) + return ctx + def add_events_for_days(request, baseqs, before, after, ebd, timezones): qs = baseqs.filter(is_public=True, live=True, has_subevents=False).filter(