CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix broken language field filtering in payment settings

Browse Source
This commit is contained in:
Raphael Michel
2017-04-21 14:26:19 +02:00
parent 603a3d78fc
commit 5a68eb345f
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/base/forms/__init__.py
View File

@@ -51,9 +51,9 @@ class SettingsForm(i18nfield.forms.I18nFormMixin, HierarkeyForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.obj = kwargs.get('obj', None) self.obj = kwargs.get('obj', None)
self.locales = kwargs.pop('locales', None) self.locales = self.obj.settings.get('locales') if self.obj else kwargs.pop('locales', None)
kwargs['attribute_name'] = 'settings' kwargs['attribute_name'] = 'settings'
kwargs['locales'] = self.obj.settings.get('locales') if self.obj else self.locales kwargs['locales'] = self.locales
kwargs['initial'] = self.obj.settings.freeze() kwargs['initial'] = self.obj.settings.freeze()
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)

6
src/pretix/control/forms/event.py
View File

@@ -374,7 +374,7 @@ class ProviderForm(SettingsForm):
if isinstance(v, I18nFormField): if isinstance(v, I18nFormField):
v._required = v.one_required v._required = v.one_required
v.one_required = False v.one_required = False
v.widget.enabled_langcodes = self.obj.settings.get('locales') v.widget.enabled_locales = self.locales
def clean(self): def clean(self):
cleaned_data = super().clean() cleaned_data = super().clean()
@@ -631,6 +631,10 @@ class TicketSettingsForm(SettingsForm):
v._required = v.required v._required = v.required
v.required = False v.required = False
v.widget.is_required = False v.widget.is_required = False
if isinstance(v, I18nFormField):
v._required = v.one_required
v.one_required = False
v.widget.enabled_locales = self.locales
def clean(self): def clean(self):
# required=True files should only be required if the feature is enabled # required=True files should only be required if the feature is enabled