forked from CGM_Public/pretix_original
Show date range of event series in list of events
This commit is contained in:
@@ -53,7 +53,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td><a href="{{ url }}">{{ e.name }}</a></td>
|
<td><a href="{{ url }}">{{ e.name }}</a></td>
|
||||||
<td>
|
<td>
|
||||||
{{ e.get_date_range_display }}
|
{{ e.daterange|default:e.get_date_range_display }}
|
||||||
</td>
|
</td>
|
||||||
<td class="text-right">
|
<td class="text-right">
|
||||||
<a class="btn btn-primary" href="{{ url }}">
|
<a class="btn btn-primary" href="{{ url }}">
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ from pretix.base.i18n import language
|
|||||||
from pretix.base.models import (
|
from pretix.base.models import (
|
||||||
Event, EventMetaValue, SubEvent, SubEventMetaValue,
|
Event, EventMetaValue, SubEvent, SubEventMetaValue,
|
||||||
)
|
)
|
||||||
|
from pretix.helpers.daterange import daterange
|
||||||
from pretix.multidomain.urlreverse import eventreverse
|
from pretix.multidomain.urlreverse import eventreverse
|
||||||
from pretix.presale.ical import get_ical
|
from pretix.presale.ical import get_ical
|
||||||
from pretix.presale.views import OrganizerViewMixin
|
from pretix.presale.views import OrganizerViewMixin
|
||||||
@@ -130,6 +131,17 @@ class OrganizerIndex(OrganizerViewMixin, ListView):
|
|||||||
qs = filter_qs_by_attr(qs, self.request)
|
qs = filter_qs_by_attr(qs, self.request)
|
||||||
return qs
|
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):
|
def add_events_for_days(request, baseqs, before, after, ebd, timezones):
|
||||||
qs = baseqs.filter(is_public=True, live=True, has_subevents=False).filter(
|
qs = baseqs.filter(is_public=True, live=True, has_subevents=False).filter(
|
||||||
|
|||||||
Reference in New Issue
Block a user