Ticket #4312: models.diff

django/newforms/models.py

@@ -12 +12 @@
 __all__ = ('save_instance', 'form_for_model', 'form_for_instance', 'form_for_fields',
            'ModelChoiceField', 'ModelMultipleChoiceField')
 
-def save_instance(form, instance, fields=None, fail_message='saved', commit=True):
+def save_instance(form, instance, fields=None, defaults=None, fail_message='saved', commit=True):
     """
     Saves bound Form ``form``'s cleaned_data into model instance ``instance``.
 
@@ -31 +31 @@
         if fields and f.name not in fields:
             continue
         setattr(instance, f.name, cleaned_data[f.name])
+    if defaults:
+        for f in defaults:
+            setattr(instance, f, defaults[f])
     if commit:
         instance.save()
         for f in opts.many_to_many:
@@ -46 +49 @@
 
 def make_model_save(model, fields, fail_message):
     "Returns the save() method for a Form."
-    def save(self, commit=True):
-        return save_instance(self, model(), fields, fail_message, commit)
+    def save(self, commit=True, defaults=None):
+        return save_instance(self, model(), fields, defaults, fail_message, commit)
     return save
     
 def make_instance_save(instance, fields, fail_message):
     "Returns the save() method for a Form."
-    def save(self, commit=True):
-        return save_instance(self, instance, fields, fail_message, commit)
+    def save(self, commit=True, defaults=None):
+        return save_instance(self, instance, fields, defaults, fail_message, commit)
     return save
 
 def form_for_model(model, form=BaseForm, fields=None, formfield_callback=lambda f: f.formfield()):