summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-03-08 18:16:38 +0100
committerClaude Paroz <claude@2xlibre.net>2013-03-08 18:19:24 +0100
commitcbfb8ed53b31ec9701f5fb8e519a8644fd4c8095 (patch)
tree15c59a9a317fe3acb7956ff4c0e680fc959ef00a /django/forms
parent6983a1a540a6e6c3bd941fa15ddd8cb49f9ec74e (diff)
Fixed a regression in forms changed_data
Thanks Loic Bistuer for spotting the regression and the initial patch. Refs #16612.
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/forms.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/django/forms/forms.py b/django/forms/forms.py
index 38601432bc..5bc9b2d500 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -345,8 +345,13 @@ class BaseForm(object):
else:
initial_prefixed_name = self.add_initial_prefix(name)
hidden_widget = field.hidden_widget()
- initial_value = field.to_python(hidden_widget.value_from_datadict(
- self.data, self.files, initial_prefixed_name))
+ try:
+ initial_value = field.to_python(hidden_widget.value_from_datadict(
+ self.data, self.files, initial_prefixed_name))
+ except ValidationError:
+ # Always assume data has changed if validation fails.
+ self._changed_data.append(name)
+ continue
if hasattr(field.widget, '_has_changed'):
warnings.warn("The _has_changed method on widgets is deprecated,"
" define it at field level instead.",