diff --git a/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/history.html b/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/history.html index 53accc0c7..2e71f9b9f 100644 --- a/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/history.html +++ b/src/pretix/plugins/sendmail/templates/pretixplugins/sendmail/history.html @@ -16,10 +16,13 @@ {% if log.display %}
{{ log.display }} {% endif %} -
{% trans "Sent to orders:" %} +
{% trans "Sent to orders:" %} {% for status in log.parsed_data.sendto %} {{ status }}{% if forloop.revcounter > 1 %},{% endif %} {% endfor %} + {% if log.pdata.items %} +
{{ log.pdata.items|join:", " }} + {% endif %} {% if log.pdata.subevent_obj %}
{{ log.pdata.subevent_obj }} {% endif %} diff --git a/src/pretix/plugins/sendmail/views.py b/src/pretix/plugins/sendmail/views.py index 68bc9b202..fd125fb0f 100644 --- a/src/pretix/plugins/sendmail/views.py +++ b/src/pretix/plugins/sendmail/views.py @@ -145,12 +145,15 @@ class EmailHistoryView(EventPermissionRequiredMixin, ListView): qs = LogEntry.objects.filter( event=self.request.event, action_type='pretix.plugins.sendmail.sent' - ) + ).select_related('event', 'user') return qs def get_context_data(self, **kwargs): ctx = super().get_context_data() + itemcache = { + i.pk: str(i) for i in self.request.event.items.all() + } status = dict(Order.STATUS_CHOICE) status['overdue'] = _('pending with payment overdue') status['r'] = status['c'] @@ -165,6 +168,9 @@ class EmailHistoryView(EventPermissionRequiredMixin, ListView): log.pdata['sendto'] = [ status[s] for s in log.pdata['sendto'] ] + log.pdata['items'] = [ + itemcache[i['id']] for i in log.pdata.get('items', []) + ] if log.pdata.get('subevent'): try: log.pdata['subevent_obj'] = self.request.event.subevents.get(pk=log.pdata['subevent']['id'])