Ticket #5153: ticket5153.diff

django/newforms/models.py

@@ -29 +29 @@
             continue
         form.initial[f.name] = f.value_from_object(instance)
 
-def save_instance(form, instance, fields=None, fail_message='saved', commit=True):
+def save_instance(form, instance, fields=None, fail_message='saved', commit=True,
+                  ensure_valid=True):
     """
     Saves bound Form ``form``'s cleaned_data into model instance ``instance``.
 
     If commit=True, then the changes to ``instance`` will be saved to the
-    database. Returns ``instance``.
+    database. If ensure_valid=False, the changes will be saved even if the form
+    has validation errors.
+    
+    Returns ``instance``.
     """
     from django.db import models
     opts = instance.__class__._meta
-    if form.errors:
+    if not ensure_valid:
+        form.full_clean(ensure_valid=False)
+    elif form.errors:
         raise ValueError("The %s could not be %s because the data didn't validate." % (opts.object_name, fail_message))
     cleaned_data = form.cleaned_data
     for f in opts.fields:

django/newforms/forms.py

@@ -170 +170 @@
         """
         return self.errors.get(NON_FIELD_ERRORS, ErrorList())
 
-    def full_clean(self):
+    def full_clean(self, ensure_valid=True):
         """
         Cleans all of self.data and populates self._errors and
         self.cleaned_data.
+        
+        If ensure_valid=True, the self.cleaned_data attribute is not set if
+        validation errors are encountered.
         """
         self._errors = ErrorDict()
         if not self.is_bound: # Stop further processing.
@@ -192 +195 @@
                     self.cleaned_data[name] = value
             except ValidationError, e:
                 self._errors[name] = e.messages
-                if name in self.cleaned_data:
+                if ensure_valid and name in self.cleaned_data:
                     del self.cleaned_data[name]
         try:
             self.cleaned_data = self.clean()
         except ValidationError, e:
             self._errors[NON_FIELD_ERRORS] = e.messages
-        if self._errors:
+        if ensure_valid and self._errors:
             delattr(self, 'cleaned_data')
 
     def clean(self):