From ddefeeaf02a40bb790cad6df47f94eb435bdf525 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 12 Oct 2018 10:44:21 +0200 Subject: [PATCH] Waiting list should send things out even if waiting list is disabled --- src/pretix/base/services/waitinglist.py | 2 +- src/pretix/control/forms/event.py | 3 ++- src/pretix/plugins/sendmail/tasks.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pretix/base/services/waitinglist.py b/src/pretix/base/services/waitinglist.py index 3955054e1..0241e3476 100644 --- a/src/pretix/base/services/waitinglist.py +++ b/src/pretix/base/services/waitinglist.py @@ -74,5 +74,5 @@ def process_waitinglist(sender, **kwargs): live=True ).prefetch_related('_settings_objects', 'organizer___settings_objects').select_related('organizer') for e in qs: - if e.settings.waiting_list_enabled and e.settings.waiting_list_auto and e.presale_is_running: + if e.settings.waiting_list_auto and e.presale_is_running: assign_automatically.apply_async(args=(e.pk,)) diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py index bdbddbf61..43f166d76 100644 --- a/src/pretix/control/forms/event.py +++ b/src/pretix/control/forms/event.py @@ -322,7 +322,8 @@ class EventSettingsForm(SettingsForm): label=_("Automatic waiting list assignments"), help_text=_("If ticket capacity becomes free, automatically create a voucher and send it to the first person " "on the waiting list for that product. If this is not active, mails will not be send automatically " - "but you can send them manually via the control panel."), + "but you can send them manually via the control panel. If you disable the waiting list but keep " + "this option enabled, tickets will still be sent out."), required=False, widget=forms.CheckboxInput(), ) diff --git a/src/pretix/plugins/sendmail/tasks.py b/src/pretix/plugins/sendmail/tasks.py index 749db422f..6dcf18dd3 100644 --- a/src/pretix/plugins/sendmail/tasks.py +++ b/src/pretix/plugins/sendmail/tasks.py @@ -54,7 +54,7 @@ def send_mails(event: int, user: int, subject: dict, message: dict, orders: list 'pretix.plugins.sendmail.order.email.sent', user=user, data={ - 'subject': subject.localize(o.locale), + 'subject': subject.localize(o.locale).format_map(email_context), 'message': message.localize(o.locale).format_map(email_context), 'recipient': o.email }