mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

Fixed #22097 -- Fixed change detection for TypedChoiceField 

Thanks Igor Mitrenko for the report.
This commit is contained in:
Claude Paroz 2014-02-20 13:40:42 +01:00
parent 821fc925f0
commit cb844497d0
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/forms/fields.py
View File

@ -191,6 +191,8 @@ class Field(object):
initial_value = initial if initial is not None else '' initial_value = initial if initial is not None else ''
try: try:
data = self.to_python(data) data = self.to_python(data)
if hasattr(self, '_coerce'):
data = self._coerce(data)
except ValidationError: except ValidationError:
return True return True
data_value = data if data is not None else '' data_value = data if data is not None else ''

1
tests/forms_tests/tests/test_fields.py
View File

@ -961,6 +961,7 @@ class FieldsTests(SimpleTestCase):
# has_changed should not trigger required validation # has_changed should not trigger required validation
f = TypedChoiceField(choices=[(1, "+1"), (-1, "-1")], coerce=int, required=True) f = TypedChoiceField(choices=[(1, "+1"), (-1, "-1")], coerce=int, required=True)
self.assertFalse(f._has_changed(None, '')) self.assertFalse(f._has_changed(None, ''))
self.assertFalse(f._has_changed(1, '1'))
def test_typedchoicefield_special_coerce(self): def test_typedchoicefield_special_coerce(self):
""" """