mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop' into feature

Browse Source
This commit is contained in:
Jeremy Stretch
2024-02-05 14:38:26 -05:00
parent 317bef6796 28aee9b69a
commit 74e67afa41
106 changed files with 30533 additions and 2746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/utilities/forms/fields/fields.py
View File

@@ -105,7 +105,12 @@ class JSONField(_JSONField):
return value
if value in ('', None):
return ''
return json.dumps(value, sort_keys=True, indent=4)
if type(value) is str:
try:
value = json.loads(value, cls=self.decoder)
except json.decoder.JSONDecodeError:
return value
return json.dumps(value, sort_keys=True, indent=4, ensure_ascii=False, cls=self.encoder)
class MACAddressField(forms.Field):