Merge pull request #59 from twschiller/bugfix/58-display-none

lundberg · web-flow · commit ca5f33450a05 · 2019-12-16T09:55:38.000+01:00
#58: fix display of None value
diff --git a/django_enumfield/db/fields.py b/django_enumfield/db/fields.py
@@ -64,6 +64,8 @@ def contribute_to_class(
 
     def _get_FIELD_display(self, cls):
         value = getattr(cls, self.attname)
+        if value is None:
+            return value
         return force_text(value.label, strings_only=True)
 
     def get_prep_value(self, value):
diff --git a/django_enumfield/tests/test_enum.py b/django_enumfield/tests/test_enum.py
@@ -259,6 +259,10 @@ class CustomPersonForm(forms.Form):
         self.assertTrue(form.is_valid(), form.errors)
         self.assertEqual(form.cleaned_data["status"], six.text_type())
 
+    def test_enum_display_none(self):
+        beer = Beer(state=None)
+        self.assertIsNone(beer.get_state_display())
+
 
 class EnumTest(TestCase):
     def test_label(self):
