From b5dca762f0c45f7f16383958e897c788930cc6fd Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 23 Jul 2020 21:38:58 +0200 Subject: [PATCH] Cancelling events: Fix send_waitinglist flag --- src/pretix/base/services/cancelevent.py | 5 +++-- src/pretix/control/views/orders.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pretix/base/services/cancelevent.py b/src/pretix/base/services/cancelevent.py index f7f5c7f565..53bbd535c2 100644 --- a/src/pretix/base/services/cancelevent.py +++ b/src/pretix/base/services/cancelevent.py @@ -222,7 +222,8 @@ def cancel_event(self, event: Event, subevent: int, auto_refund: bool, keep_fee_ if send: _send_mail(o, send_subject, send_message, subevent, refund_amount, user, positions) - for wle in event.waitinglistentries.filter(subevent=subevent, voucher__isnull=True): - _send_wle_mail(wle, send_waitinglist_subject, send_waitinglist_message, subevent) + if send_waitinglist: + for wle in event.waitinglistentries.filter(subevent=subevent, voucher__isnull=True): + _send_wle_mail(wle, send_waitinglist_subject, send_waitinglist_message, subevent) return failed diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py index fc7a264368..bf5e13d16e 100644 --- a/src/pretix/control/views/orders.py +++ b/src/pretix/control/views/orders.py @@ -2032,7 +2032,7 @@ class EventCancel(EventPermissionRequiredMixin, AsyncAction, FormView): send=form.cleaned_data.get('send'), send_subject=form.cleaned_data.get('send_subject').data, send_message=form.cleaned_data.get('send_message').data, - send_waitinglist=form.cleaned_data.get('send'), + send_waitinglist=form.cleaned_data.get('send_waitinglist'), send_waitinglist_subject=form.cleaned_data.get('send_waitinglist_subject').data, send_waitinglist_message=form.cleaned_data.get('send_waitinglist_message').data, user=self.request.user.pk,