diff --git a/src/pretix/base/timeline.py b/src/pretix/base/timeline.py index bf222f35a4..c98947cc33 100644 --- a/src/pretix/base/timeline.py +++ b/src/pretix/base/timeline.py @@ -44,7 +44,7 @@ def timeline_for_event(event, subevent=None): ev = subevent or event if subevent: ev_edit_url = reverse( - 'control:event.subevent', kwargs={ + 'control:event.subevent.edit', kwargs={ 'event': event.slug, 'organizer': event.organizer.slug, 'subevent': subevent.pk diff --git a/src/pretix/control/templates/pretixcontrol/event/fragment_timeline.html b/src/pretix/control/templates/pretixcontrol/event/fragment_timeline.html index 71448e13bf..d984660ef0 100644 --- a/src/pretix/control/templates/pretixcontrol/event/fragment_timeline.html +++ b/src/pretix/control/templates/pretixcontrol/event/fragment_timeline.html @@ -1,10 +1,10 @@ {% load i18n %} -
-
+
+

- {% trans "Your timeline" %} + {% trans "Timeline" %}

-
+
{% regroup timeline by date as tl_list %} {% for day in tl_list %} @@ -33,4 +33,4 @@
{% endfor %}
- + diff --git a/src/pretix/control/templates/pretixcontrol/subevents/detail.html b/src/pretix/control/templates/pretixcontrol/subevents/detail.html index 5ffd541b01..15aa8c16cb 100644 --- a/src/pretix/control/templates/pretixcontrol/subevents/detail.html +++ b/src/pretix/control/templates/pretixcontrol/subevents/detail.html @@ -72,6 +72,7 @@ {% endif %} + {% include "pretixcontrol/event/fragment_timeline.html" %}
{% trans "Quotas" %}
diff --git a/src/pretix/control/views/subevents.py b/src/pretix/control/views/subevents.py index b40a415427..ae11b77c57 100644 --- a/src/pretix/control/views/subevents.py +++ b/src/pretix/control/views/subevents.py @@ -69,6 +69,7 @@ from pretix.base.models.orders import CancellationRequest from pretix.base.reldate import RelativeDate, RelativeDateWrapper from pretix.base.services import tickets from pretix.base.services.quotas import QuotaAvailability +from pretix.base.timeline import timeline_for_event from pretix.base.views.tasks import AsyncFormView from pretix.control.forms.checkin import SimpleCheckinListForm from pretix.control.forms.filter import SubEventFilterForm @@ -566,6 +567,15 @@ class SubEventDetail(EventPermissionRequiredMixin, DetailView): for quota in ctx["quotas"]: quota.cached_avail = qa.results[quota] + ctx['timeline'] = [ + { + 'date': t.datetime.astimezone(self.request.event.timezone).date(), + 'entry': t, + 'time': t.datetime.astimezone(self.request.event.timezone) + } + for t in timeline_for_event(self.request.event, self.object) + ] + return super().get_context_data( **kwargs, **ctx,