From 815ee29a5099020d9d9738c3745845bcd38a4333 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 11 Mar 2019 14:34:41 +0100 Subject: [PATCH] Sendmail: Backwards compatbility of from_log Fixes sentry issue PRETIXEU-Y3 --- src/pretix/plugins/sendmail/views.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/pretix/plugins/sendmail/views.py b/src/pretix/plugins/sendmail/views.py index fd125fb0f..e5703db02 100644 --- a/src/pretix/plugins/sendmail/views.py +++ b/src/pretix/plugins/sendmail/views.py @@ -43,8 +43,15 @@ class SenderView(EventPermissionRequiredMixin, FormView): 'message': LazyI18nString(logentry.parsed_data['message']), 'subject': LazyI18nString(logentry.parsed_data['subject']), 'sendto': logentry.parsed_data['sendto'], - 'items': self.request.event.items.filter(id__in=[a['id'] for a in logentry.parsed_data['items']]), } + if 'items' in logentry.parsed_data: + kwargs['initial']['items'] = self.request.event.items.filter( + id__in=[a['id'] for a in logentry.parsed_data['items']] + ) + elif logentry.parsed_data.get('item'): + kwargs['initial']['items'] = self.request.event.items.filter( + id=logentry.parsed_data['item']['id'] + ) if logentry.parsed_data.get('subevent'): try: kwargs['initial']['subevent'] = self.request.event.subevents.get(