Ticket #11925: models.py.diff

django/forms/models.py

@@ -142 +142 @@
             data[f.name] = f.value_from_object(instance)
     return data
 
-def fields_for_model(model, fields=None, exclude=None, formfield_callback=lambda f: f.formfield()):
+def fields_for_model(model, fields=None, exclude=None, formfield_callback=lambda f: f.formfield(), params={}):
     """
     Returns a ``SortedDict`` containing form fields for the given model.
 
@@ -152 +152 @@
     ``exclude`` is an optional list of field names. If provided, the named
     fields will be excluded from the returned fields, even if they are listed
     in the ``fields`` argument.
+
+    ``params`` is an optional dict mapping field names to dicts of keyword
+    arguments to be passed to the function that generates the form field from
+    the model field.
     """
     field_list = []
     opts = model._meta
@@ -162 +166 @@
             continue
         if exclude and f.name in exclude:
             continue
-        formfield = formfield_callback(f)
+        formfield = formfield_callback(f, **params.get(f.name, {}))
         if formfield:
             field_list.append((f.name, formfield))
     field_dict = SortedDict(field_list)
@@ -175 +179 @@
         self.model = getattr(options, 'model', None)
         self.fields = getattr(options, 'fields', None)
         self.exclude = getattr(options, 'exclude', None)
+        self.params = getattr(options, 'params', {})
 
 
 class ModelFormMetaclass(type):
     def __new__(cls, name, bases, attrs):
         formfield_callback = attrs.pop('formfield_callback',
-                lambda f: f.formfield())
+                lambda f, **p: f.formfield(**p))
         try:
             parents = [b for b in bases if issubclass(b, ModelForm)]
         except NameError:
@@ -198 +203 @@
         if opts.model:
             # If a model is defined, extract form fields from it.
             fields = fields_for_model(opts.model, opts.fields,
-                                      opts.exclude, formfield_callback)
+                                      opts.exclude, formfield_callback,
+                                      opts.params)
             # Override default model fields with any custom declared ones
             # (plus, include all the other declared fields).
             fields.update(declared_fields)