Return empty string in case of None

This commit is contained in:
Adrian Muntean 2019-02-20 12:26:04 +02:00
parent a0ca977cab
commit d8b872758c
2 changed files with 2 additions and 13 deletions

View File

@ -233,4 +233,4 @@ class LocalizedIntegerValue(LocalizedValue):
"""Returns string representation of value"""
value = self.translate()
return str(value) if value is not None else None
return str(value) if value is not None else ''

View File

@ -6,7 +6,7 @@ from django.conf import settings
from django import forms
from django.contrib.admin import widgets
from .value import LocalizedValue, LocalizedIntegerValue
from .value import LocalizedValue
class LocalizedFieldWidget(forms.MultiWidget):
@ -52,7 +52,6 @@ class LocalizedFieldWidget(forms.MultiWidget):
return result
def get_context(self, name, value, attrs):
value = self.remove_if_needed(value)
context = super(forms.MultiWidget, self).get_context(name, value, attrs)
if self.is_localized:
for widget in self.widgets:
@ -99,16 +98,6 @@ class LocalizedFieldWidget(forms.MultiWidget):
return attrs
@staticmethod
def remove_if_needed(value):
"""If the field LocalizedIntegerField is null in the DB then it must
be set to None so it can be represented"""
if isinstance(value, LocalizedIntegerValue):
not_none_score = list(filter(lambda x: value[x] is not None, [i[0] for i in settings.LANGUAGES]))
return value if len(not_none_score) > 0 else None
else:
return value
class LocalizedCharFieldWidget(LocalizedFieldWidget):
"""Widget that has an input box for every language."""