Ticket #13184: forms_models.diff

django/forms/models.py

@@ -39 +39 @@
     opts = instance._meta
 
     cleaned_data = form.cleaned_data
+    errors = {}
     file_field_list = []
     for f in opts.fields:
         if not f.editable or isinstance(f, models.AutoField) \
@@ -53 +54 @@
         if isinstance(f, models.FileField):
             file_field_list.append(f)
         else:
-            f.save_form_data(instance, cleaned_data[f.name])
+            try:
+                f.save_form_data(instance, cleaned_data[f.name])
+            except ValidationError, e:
+                errors[f.name] = e.messages
 
     for f in file_field_list:
-        f.save_form_data(instance, cleaned_data[f.name])
+        try:
+            f.save_form_data(instance, cleaned_data[f.name])
+        except ValidationError, e:
+                errors[f.name] = e.messages
+ 
+    if errors:
+        raise ValidationError(errors)
 
     return instance
 
@@ -320 +330 @@
         opts = self._meta
 
         # Update the model instance with self.cleaned_data.
-        self.instance = construct_instance(self, self.instance, opts.fields, opts.exclude)
+        to_python_errors = []
+        try:
+            self.instance = construct_instance(self, self.instance, opts.fields, opts.exclude)
+        except ValidationError, e:
+            to_python_errors = e.message_dict.keys()
+            self._update_errors(e.message_dict)
 
         # Clean the model instance's fields.
         try:
-            self.instance.clean_fields(exclude=exclude)
+            self.instance.clean_fields(exclude=exclude+to_python_errors)
         except ValidationError, e:
             self._update_errors(e.message_dict)