diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py index b70eee4b91..c5fd6aa3bd 100644 --- a/src/pretix/control/forms/event.py +++ b/src/pretix/control/forms/event.py @@ -1,5 +1,6 @@ from django import forms from django.conf import settings +from django.core.exceptions import ValidationError from django.utils.translation import ugettext_lazy as _ from pytz import common_timezones @@ -161,6 +162,18 @@ class EventSettingsForm(SettingsForm): help_text=_("Sender address for outgoing e-mails") ) + def clean(self): + data = super().clean() + if data['locale'] not in data['locales']: + raise ValidationError({ + 'locale': _('Your default locale must also be enebled for your event (see box above).') + }) + if data['attendee_names_required'] and not data['attendee_names_asked']: + raise ValidationError({ + 'attendee_names_required': _('You cannot require specifying attendee names if you do not ask for them.') + }) + return data + class ProviderForm(SettingsForm): """ diff --git a/src/pretix/control/templates/pretixcontrol/event/payment.html b/src/pretix/control/templates/pretixcontrol/event/payment.html index 25b120586c..c2a3a48c87 100644 --- a/src/pretix/control/templates/pretixcontrol/event/payment.html +++ b/src/pretix/control/templates/pretixcontrol/event/payment.html @@ -4,7 +4,6 @@ {% block inside %}
{% csrf_token %} - {% bootstrap_form_errors formset %}
{% trans "Payment settings" %} {% for provider in providers %} diff --git a/src/pretix/control/templates/pretixcontrol/event/permissions.html b/src/pretix/control/templates/pretixcontrol/event/permissions.html index 9ea240417b..b40904d4fb 100644 --- a/src/pretix/control/templates/pretixcontrol/event/permissions.html +++ b/src/pretix/control/templates/pretixcontrol/event/permissions.html @@ -6,7 +6,7 @@ {% csrf_token %}
{% trans "Permissions" %} - {% bootstrap_form_errors formset %} + {% bootstrap_formset_errors formset %} {{ formset.management_form }}