From c5ace8447d09cc98b3bcaaf4642a37c1f13dde4d Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 27 Jul 2020 18:03:10 +0200 Subject: [PATCH] Fix country fields always being required --- src/pretix/base/forms/questions.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pretix/base/forms/questions.py b/src/pretix/base/forms/questions.py index 7636fcaa3e..717b342663 100644 --- a/src/pretix/base/forms/questions.py +++ b/src/pretix/base/forms/questions.py @@ -397,13 +397,14 @@ class BaseQuestionsForm(forms.Form): ) elif q.type == Question.TYPE_COUNTRYCODE: field = CountryField( - countries=CachedCountries + countries=CachedCountries, + blank=True, null=True, blank_label=' ', ).formfield( label=label, required=required, help_text=help_text, widget=forms.Select, - empty_label='', - initial=initial.answer if initial else guess_country(event), + empty_label=' ', + initial=initial.answer if initial else (guess_country(event) if required else None), ) elif q.type == Question.TYPE_CHOICE: field = forms.ModelChoiceField(