Ticket #13769: formmodel_fields_attrs_r13353.patch

django/forms/models.py

@@ -150 +150 @@
             data[f.name] = f.value_from_object(instance)
     return data
 
-def fields_for_model(model, fields=None, exclude=None, widgets=None, formfield_callback=lambda f, **kwargs: f.formfield(**kwargs)):
+def fields_for_model(model, fields=None, exclude=None, widgets=None, formfield_callback=lambda f, **kwargs: f.formfield(**kwargs), fields_attrs={}):
     """
     Returns a ``SortedDict`` containing form fields for the given model.
 
@@ -175 +175 @@
             kwargs = {'widget': widgets[f.name]}
         else:
             kwargs = {}
+        if fields_attrs and f.name in fields_attrs:
+            # @@@ prevent collision with widget
+            if 'widget' in fields_attrs[f.name]:
+                del fields_attrs[f.name]['widget']
+            kwargs.update(fields_attrs[f.name])
         formfield = formfield_callback(f, **kwargs)
         if formfield:
             field_list.append((f.name, formfield))
@@ -192 +197 @@
     def __init__(self, options=None):
         self.model = getattr(options, 'model', None)
         self.fields = getattr(options, 'fields', None)
+        self.fields_attrs = getattr(options, 'fields_attrs', None)
         self.exclude = getattr(options, 'exclude', None)
         self.widgets = getattr(options, 'widgets', None)
 
@@ -217 +223 @@
         if opts.model:
             # If a model is defined, extract form fields from it.
             fields = fields_for_model(opts.model, opts.fields,
-                                      opts.exclude, opts.widgets, formfield_callback)
+                                      opts.exclude, opts.widgets, formfield_callback,
+                                      opts.fields_attrs)
             # Override default model fields with any custom declared ones
             # (plus, include all the other declared fields).
             fields.update(declared_fields)