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

Require certain parts of names if names are required

Browse Source
This commit is contained in:
Raphael Michel
2019-11-12 18:15:25 +01:00
parent 63a46d0156
commit 0e9d2cfc10
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/pretix/base/forms/questions.py
View File

@@ -41,6 +41,9 @@ from pretix.presale.signals import question_form_fields
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
REQUIRED_NAME_PARTS = ['given_name', 'family_name', 'full_name']
class NamePartsWidget(forms.MultiWidget): class NamePartsWidget(forms.MultiWidget):
widget = forms.TextInput widget = forms.TextInput
autofill_map = { autofill_map = {
@@ -91,15 +94,20 @@ class NamePartsWidget(forms.MultiWidget):
except (IndexError, TypeError): except (IndexError, TypeError):
widget_value = None widget_value = None
if id_: if id_:
final_attrs = dict( these_attrs = dict(
final_attrs, final_attrs,
id='%s_%s' % (id_, i), id='%s_%s' % (id_, i),
title=self.scheme['fields'][i][1], title=self.scheme['fields'][i][1],
placeholder=self.scheme['fields'][i][1], placeholder=self.scheme['fields'][i][1],
) )
final_attrs['autocomplete'] = (self.attrs.get('autocomplete', '') + ' ' + self.autofill_map.get(self.scheme['fields'][i][0], 'off')).strip() if self.scheme['fields'][i][0] in REQUIRED_NAME_PARTS:
final_attrs['data-size'] = self.scheme['fields'][i][2] these_attrs['required'] = 'required'
output.append(widget.render(name + '_%s' % i, widget_value, final_attrs, renderer=renderer)) these_attrs.pop('data-no-required-attr', None)
these_attrs['autocomplete'] = (self.attrs.get('autocomplete', '') + ' ' + self.autofill_map.get(self.scheme['fields'][i][0], 'off')).strip()
these_attrs['data-size'] = self.scheme['fields'][i][2]
else:
these_attrs = final_attrs
output.append(widget.render(name + '_%s' % i, widget_value, these_attrs, renderer=renderer))
return mark_safe(self.format_output(output)) return mark_safe(self.format_output(output))
def format_output(self, rendered_widgets) -> str: def format_output(self, rendered_widgets) -> str:
@@ -159,8 +167,12 @@ class NamePartsFormField(forms.MultiValueField):
def clean(self, value) -> dict: def clean(self, value) -> dict:
value = super().clean(value) value = super().clean(value)
if self.one_required and (not value or not any(v for v in value)): if self.one_required and (not value or not any(v for v in value.values())):
raise forms.ValidationError(self.error_messages['required'], code='required') raise forms.ValidationError(self.error_messages['required'], code='required')
if self.one_required:
for k, v in value.items():
if k in REQUIRED_NAME_PARTS and not v:
raise forms.ValidationError(self.error_messages['required'], code='required')
if self.require_all_fields and not all(v for v in value): if self.require_all_fields and not all(v for v in value):
raise forms.ValidationError(self.error_messages['incomplete'], code='required') raise forms.ValidationError(self.error_messages['incomplete'], code='required')
return value return value