test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #25233 -- Fixed HStoreField.has_changed() handling of initial values. 

Thanks Simon Charette for review.
This commit is contained in:
Tim Graham 2015-08-07 13:06:56 -04:00
parent 6ed613b2a5
commit a7b7f27c05
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/contrib/postgres/forms/hstore.py
View File

@ -23,6 +23,7 @@ class HStoreField(forms.CharField):
def to_python(self, value): def to_python(self, value):
if not value: if not value:
return {} return {}
if not isinstance(value, dict):
try: try:
value = json.loads(value) value = json.loads(value)
except ValueError: except ValueError:

4
docs/releases/1.8.4.txt
View File

@ -22,5 +22,5 @@ Bugfixes
* Prevented an exception in ``TestCase.setUpTestData()`` from leaking the * Prevented an exception in ``TestCase.setUpTestData()`` from leaking the
transaction (:ticket:`25176`). transaction (:ticket:`25176`).
* Fixed ``has_changed()`` method in * Fixed ``has_changed()`` method in ``contrib.postgres.forms.HStoreField``
:class:`django.contrib.postgres.forms.HStoreField`. (:ticket:`25215`, :ticket:`25233`).

6
tests/postgres_tests/test_hstore.py
View File

@ -206,6 +206,12 @@ class TestFormField(PostgreSQLTestCase):
form_w_hstore = HStoreFormTest({'f1': '{"a": 2}'}, initial={'f1': '{"a": 1}'}) form_w_hstore = HStoreFormTest({'f1': '{"a": 2}'}, initial={'f1': '{"a": 1}'})
self.assertTrue(form_w_hstore.has_changed()) self.assertTrue(form_w_hstore.has_changed())
form_w_hstore = HStoreFormTest({'f1': '{"a": 1}'}, initial={'f1': {"a": 1}})
self.assertFalse(form_w_hstore.has_changed())
form_w_hstore = HStoreFormTest({'f1': '{"a": 2}'}, initial={'f1': {"a": 1}})
self.assertTrue(form_w_hstore.has_changed())
class TestValidator(PostgreSQLTestCase): class TestValidator(PostgreSQLTestCase):