Implement code review suggestions for #29

This commit is contained in:
Swen Kooij 2017-07-15 13:59:39 +03:00
parent aaf49614f2
commit aff41f671a
2 changed files with 8 additions and 5 deletions

View File

@ -36,7 +36,7 @@ class LocalizedField(HStoreField):
self.required = []
elif self.required is None and not self.blank:
self.required = [settings.LANGUAGE_CODE]
elif type(self.required) == bool and self.required:
elif self.required is True:
self.required = [lang_code for lang_code, _ in settings.LANGUAGES]
def contribute_to_class(self, model, name, **kwargs):

View File

@ -25,9 +25,11 @@ class LocalizedFieldForm(forms.MultiValueField):
fields = []
for lang_code, _ in settings.LANGUAGES:
field_options = {'required': lang_code in required_langs}
field_options = dict(
required=lang_code in required_langs,
label=lang_code
)
field_options['label'] = lang_code
fields.append(self.field_class(**field_options))
super(LocalizedFieldForm, self).__init__(
@ -35,9 +37,10 @@ class LocalizedFieldForm(forms.MultiValueField):
require_all_fields=False,
*args, **kwargs
)
# set 'required' attribute for each widget separately
for f, w in zip(self.fields, self.widget.widgets):
w.is_required = f.required
for field, widget in zip(self.fields, self.widget.widgets):
widget.is_required = field.required
def compress(self, value: List[str]) -> value_class:
"""Compresses the values from individual fields