jeremystretch hace 4 años
padre
commit
7aa1fabbd7
Se han modificado 2 ficheros con 8 adiciones y 1 borrados
  1. 1 1
      netbox/extras/models/customfields.py
  2. 7 0
      netbox/extras/tests/test_forms.py

+ 1 - 1
netbox/extras/models/customfields.py

@@ -251,7 +251,7 @@ class CustomField(ChangeLoggedModel):
         if self.type == CustomFieldTypeChoices.TYPE_OBJECT:
         if self.type == CustomFieldTypeChoices.TYPE_OBJECT:
             return value.pk
             return value.pk
         if self.type == CustomFieldTypeChoices.TYPE_MULTIOBJECT:
         if self.type == CustomFieldTypeChoices.TYPE_MULTIOBJECT:
-            return [obj.pk for obj in value]
+            return [obj.pk for obj in value] or None
         return value
         return value
 
 
     def deserialize(self, value):
     def deserialize(self, value):

+ 7 - 0
netbox/extras/tests/test_forms.py

@@ -52,6 +52,13 @@ class CustomFieldModelFormTest(TestCase):
         )
         )
         cf_object.content_types.set([obj_type])
         cf_object.content_types.set([obj_type])
 
 
+        cf_multiobject = CustomField.objects.create(
+            name='multiobject',
+            type=CustomFieldTypeChoices.TYPE_MULTIOBJECT,
+            object_type=ContentType.objects.get_for_model(Site)
+        )
+        cf_multiobject.content_types.set([obj_type])
+
     def test_empty_values(self):
     def test_empty_values(self):
         """
         """
         Test that empty custom field values are stored as null
         Test that empty custom field values are stored as null