mirror of
https://github.com/netbox-community/netbox.git
synced 2025-07-16 04:02:52 -06:00
Fixes #14838: JSONField should treat initial form data as JSON
This commit is contained in:
parent
23e201cec6
commit
481d16de08
@ -105,7 +105,12 @@ class JSONField(_JSONField):
|
|||||||
return value
|
return value
|
||||||
if value in ('', None):
|
if value in ('', None):
|
||||||
return ''
|
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):
|
class MACAddressField(forms.Field):
|
||||||
|
Loading…
Reference in New Issue
Block a user