From d8b872758c4686aed1146da9dfa82ae7836f1e5f Mon Sep 17 00:00:00 2001 From: Adrian Muntean Date: Wed, 20 Feb 2019 12:26:04 +0200 Subject: [PATCH] Return empty string in case of None --- localized_fields/value.py | 2 +- localized_fields/widgets.py | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/localized_fields/value.py b/localized_fields/value.py index 85c90cc..1c738d8 100644 --- a/localized_fields/value.py +++ b/localized_fields/value.py @@ -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 '' diff --git a/localized_fields/widgets.py b/localized_fields/widgets.py index 2775a1f..f48bf5a 100644 --- a/localized_fields/widgets.py +++ b/localized_fields/widgets.py @@ -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."""