Ticket #4967: newforms_models_defaults.diff

newforms/models.py

@@ -60 +60 @@
         return save_instance(self, instance, fields, fail_message, commit)
     return save
 
-def form_for_model(model, form=BaseForm, fields=None, formfield_callback=lambda f: f.formfield()):
+def form_for_model(model, form=BaseForm, fields=None, formfield_callback=lambda f, **kwargs: f.formfield(**kwargs)):
     """
     Returns a Form class for the given Django model class.
 
@@ -70 +70 @@
     determining the formfield for a given database field. It's a callable that
     takes a database Field instance and returns a form Field instance.
     """
+    from django.db import models
     opts = model._meta
     field_list = []
     for f in opts.fields + opts.many_to_many:
@@ -77 +78 @@
             continue
         if fields and not f.name in fields:
             continue
-        formfield = formfield_callback(f)
+        if f.default==models.fields.NOT_PROVIDED:
+            value=None
+        else:
+            value=f.default
+        formfield = formfield_callback(f, initial=value)
         if formfield:
             field_list.append((f.name, formfield))
     base_fields = SortedDictFromList(field_list)