NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-14 07:42:18 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature

Browse Source
This commit is contained in:
Jeremy Stretch
2024-05-01 16:09:14 -04:00
parent 1add918d31 39a830798e
commit 312291b010
38 changed files with 794 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
import decimal
import json
import re
from datetime import datetime, date
@@ -488,7 +489,7 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
# JSON
elif self.type == CustomFieldTypeChoices.TYPE_JSON:
field = JSONField(required=required, initial=initial)
field = JSONField(required=required, initial=json.dumps(initial) if initial else '')
# Object
elif self.type == CustomFieldTypeChoices.TYPE_OBJECT: