diff options
| author | Olexander Yermakov <mannavard1611@gmail.com> | 2016-07-26 08:18:08 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-07-27 08:43:07 -0400 |
| commit | 714e287d9a2b8ca7668a951e7193d9bbae3c3162 (patch) | |
| tree | 58c4347be03d18afe620570ffea3d9902c64c48c /django | |
| parent | 3744fc1666c41aeb4ed44f31605bafdb413b42bc (diff) | |
[1.10.x] Fixed #26949 -- Fixed crash of disabled forms.JSONField.
Backport of 68de48c96328e13d5dbdb1f3006e4a1ca74f3c34 from master
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/postgres/forms/jsonb.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/django/contrib/postgres/forms/jsonb.py b/django/contrib/postgres/forms/jsonb.py index 415288dc90..df2504cc98 100644 --- a/django/contrib/postgres/forms/jsonb.py +++ b/django/contrib/postgres/forms/jsonb.py @@ -21,6 +21,8 @@ class JSONField(forms.CharField): super(JSONField, self).__init__(**kwargs) def to_python(self, value): + if self.disabled: + return value if value in self.empty_values: return None try: |