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

Closes #2402: Order and format JSON data in form fields

Browse Source
This commit is contained in:
Jeremy Stretch
2018-09-13 11:31:34 -04:00
parent 3a88e43103
commit 292647da14
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/utilities/forms.py
View File

@ -2,11 +2,12 @@ from __future__ import unicode_literals
import csv
from io import StringIO
import json
import re
from django import forms
from django.conf import settings
from django.contrib.postgres.forms import JSONField as _JSONField
from django.contrib.postgres.forms.jsonb import JSONField as _JSONField, InvalidJSONInput
from django.db.models import Count
from django.urls import reverse_lazy
from mptt.forms import TreeNodeMultipleChoiceField
@ -556,9 +557,11 @@ class JSONField(_JSONField):
self.widget.attrs['placeholder'] = ''
def prepare_value(self, value):
if isinstance(value, InvalidJSONInput):
return value
if value is None:
return ''
return super(JSONField, self).prepare_value(value)
return json.dumps(value, sort_keys=True, indent=4)
#