mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-29 22:56:46 +01:00
Code Issues Releases Wiki Activity

Refs #27003 -- Fixed JSONField crash on converted values.

Browse Source
This commit is contained in:
Brandon Chinn 2016-11-11 17:07:31 -08:00 committed by Tim Graham
parent 6573274161
commit eed6150009
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/contrib/postgres/forms/jsonb.py
View File

@ -11,6 +11,10 @@ class InvalidJSONInput(six.text_type):
pass
class JSONString(six.text_type):
pass
class JSONField(forms.CharField):
default_error_messages = {
'invalid': _("'%(value)s' value must be valid JSON."),
@ -22,14 +26,20 @@ class JSONField(forms.CharField):
return value
if value in self.empty_values:
return None
elif isinstance(value, (list, dict, int, float, JSONString)):
return value
try:
return json.loads(value)
converted = json.loads(value)
except ValueError:
raise forms.ValidationError(
self.error_messages['invalid'],
code='invalid',
params={'value': value},
)
if isinstance(converted, six.text_type):
return JSONString(converted)
else:
return converted
def bound_data(self, data, initial):
if self.disabled:

10
tests/postgres_tests/test_json.py
View File

@ -365,3 +365,13 @@ class TestFormField(PostgreSQLTestCase):
field = CustomJSONField()
self.assertIsInstance(field.widget, widgets.Input)
def test_already_converted_value(self):
field = forms.JSONField(required=False)
tests = [
'["a", "b", "c"]', '{"a": 1, "b": 2}', '1', '1.5', '"foo"',
'true', 'false', 'null',
]
for json_string in tests:
val = field.clean(json_string)
self.assertEqual(field.clean(val), val)