pub/django-localized-fields
1
0
Fork 0
mirror of https://github.com/SectorLabs/django-localized-fields.git synced 2025-10-30 18:48:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Slight clean up, use dict instead of {}

Browse Source
This commit is contained in:
Swen Kooij
2017-07-15 14:04:09 +03:00
parent aff41f671a
commit 5ac05efbd0
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
localized_fields/fields/field.py
View File

@@ -177,9 +177,6 @@ class LocalizedField(HStoreField):
# are any of the language fiels None/empty? # are any of the language fiels None/empty?
is_all_null = True is_all_null = True
for lang_code, _ in settings.LANGUAGES: for lang_code, _ in settings.LANGUAGES:
# NOTE(seroy): use check for None, instead of
# `bool(value.get(lang_code))==True` condition, cause in this way
# we can not save '' value
if value.get(lang_code) is not None: if value.get(lang_code) is not None:
is_all_null = False is_all_null = False
break break
@@ -209,8 +206,6 @@ class LocalizedField(HStoreField):
for lang in self.required: for lang in self.required:
lang_val = getattr(value, settings.LANGUAGE_CODE) lang_val = getattr(value, settings.LANGUAGE_CODE)
# NOTE(seroy): use check for None, instead of `not lang_val`
# condition, cause in this way we can not save '' value
if lang_val is None: if lang_val is None:
raise IntegrityError('null value in column "%s.%s" violates' \ raise IntegrityError('null value in column "%s.%s" violates' \
'not-null constraint' % (self.name, lang)) 'not-null constraint' % (self.name, lang))
@@ -218,13 +213,11 @@ class LocalizedField(HStoreField):
def formfield(self, **kwargs): def formfield(self, **kwargs):
"""Gets the form field associated with this field.""" """Gets the form field associated with this field."""
defaults = { defaults = dict(form_class=LocalizedFieldForm)
'form_class': LocalizedFieldForm
} form_class = kwargs.get('form_class', LocalizedFieldForm)
if issubclass(kwargs.get('form_class', LocalizedFieldForm), if issubclass(form_class, LocalizedFieldForm):
LocalizedFieldForm): defaults.update(dict(required_langs=self.required))
defaults.update({
'required_langs': self.required
})
defaults.update(kwargs) defaults.update(kwargs)
return super().formfield(**defaults) return super().formfield(**defaults)