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

16640 convert JSON field from str to dict

Browse Source
This commit is contained in:
Arthur Hanson 2024-07-29 19:17:14 +07:00
parent 1c380aab98
commit cb8fdbe401
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/netbox/forms/base.py
View File

@ -39,10 +39,7 @@ class NetBoxModelForm(CheckLastUpdatedMixin, CustomFieldsMixin, TagsMixin, forms
form_field = customfield.to_form_field(set_initial=False) form_field = customfield.to_form_field(set_initial=False)
initial = self.instance.custom_field_data.get(customfield.name) initial = self.instance.custom_field_data.get(customfield.name)
if customfield.type == CustomFieldTypeChoices.TYPE_JSON: if customfield.type == CustomFieldTypeChoices.TYPE_JSON:
if initial is not None: form_field.initial = json.dumps(initial)
form_field.initial = json.dumps(initial)
else:
form_field.initial = ''
else: else:
form_field.initial = initial form_field.initial = initial
return form_field return form_field
@ -63,6 +60,8 @@ class NetBoxModelForm(CheckLastUpdatedMixin, CustomFieldsMixin, TagsMixin, forms
if value in self.fields[cf_name].empty_values: if value in self.fields[cf_name].empty_values:
self.instance.custom_field_data[key] = None self.instance.custom_field_data[key] = None
else: else:
if customfield.type == CustomFieldTypeChoices.TYPE_JSON and type(value) is str:
value = json.loads(value)
self.instance.custom_field_data[key] = customfield.serialize(value) self.instance.custom_field_data[key] = customfield.serialize(value)
return super().clean() return super().clean()