NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-24 08:25:17 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

move logic from deserialize to to_internal_value

Browse Source
This commit is contained in:
Pieter Lambrecht 2022-09-28 10:39:20 +02:00
parent 6af1aae2e6
commit 291eebdba7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/extras/api/customfields.py
View File

@ -69,6 +69,12 @@ class CustomFieldsDataField(Field):
"values." "values."
) )
for cf in self._get_custom_fields():
if cf.name in data.keys():
# Convert the mixed array of dict and id's into id's only
if cf.type == CustomFieldTypeChoices.TYPE_MULTIOBJECT:
data[cf.name] = [obj['id'] if isinstance(obj, dict) else obj for obj in data[cf.name]] or None
# If updating an existing instance, start with existing custom_field_data # If updating an existing instance, start with existing custom_field_data
if self.parent.instance: if self.parent.instance:
data = {**self.parent.instance.custom_field_data, **data} data = {**self.parent.instance.custom_field_data, **data}

3
netbox/extras/models/customfields.py
View File

@ -293,9 +293,8 @@ class CustomField(CloningMixin, ExportTemplatesMixin, WebhooksMixin, ChangeLogge
model = self.object_type.model_class() model = self.object_type.model_class()
return model.objects.filter(pk=value).first() return model.objects.filter(pk=value).first()
if self.type == CustomFieldTypeChoices.TYPE_MULTIOBJECT: if self.type == CustomFieldTypeChoices.TYPE_MULTIOBJECT:
valueids = [obj['id'] if isinstance(obj, dict) else obj for obj in value] or None
model = self.object_type.model_class() model = self.object_type.model_class()
return model.objects.filter(pk__in=valueids) return model.objects.filter(pk__in=value)
return value return value
def to_form_field(self, set_initial=True, enforce_required=True, for_csv_import=False): def to_form_field(self, set_initial=True, enforce_required=True, for_csv_import=False):