From 4b96e862b4674e85d1a28f2849685aa3135bc557 Mon Sep 17 00:00:00 2001 From: Grzegorz Slusarek Date: Mon, 8 Dec 2014 23:37:59 +0100 Subject: [1.7.x] Fixed #23674 -- Fixed a crash when a MultiValueField has invalid data. Backport of 0dea81cd6d34b3e41cc4bbec99b5fdf06142b09e from master --- django/forms/fields.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'django/forms') diff --git a/django/forms/fields.py b/django/forms/fields.py index f686b34a09..2823aaf53a 100644 --- a/django/forms/fields.py +++ b/django/forms/fields.py @@ -1068,7 +1068,11 @@ class MultiValueField(Field): if not isinstance(initial, list): initial = self.widget.decompress(initial) for field, initial, data in zip(self.fields, initial, data): - if field._has_changed(field.to_python(initial), data): + try: + initial = field.to_python(initial) + except ValidationError: + return True + if field._has_changed(initial, data): return True return False -- cgit v1.3