Ticket #15315: ticket15315.patch

django/forms/models.py

@@ -368 +368 @@
     __metaclass__ = ModelFormMetaclass
 
 def modelform_factory(model, form=ModelForm, fields=None, exclude=None,
-                       formfield_callback=None):
+                       widgets=None, formfield_callback=None):
     # Create the inner Meta class. FIXME: ideally, we should be able to
     # construct a ModelForm without creating and passing in a temporary
     # inner class.
@@ -379 +379 @@
         attrs['fields'] = fields
     if exclude is not None:
         attrs['exclude'] = exclude
+    if widgets is not None:
+        attrs['widgets'] = widgets
 
     # If parent form class already has an inner Meta, the Meta we're
     # creating needs to inherit from the parent's inner meta.

tests/regressiontests/model_forms_regress/tests.py

@@ -275 +275 @@
         Form = modelform_factory(Person, form=BaseForm)
         self.assertTrue(Form.base_fields['name'].widget is widget)
 
+    def test_factory_with_widget_argument(self):
+        """ Regression for #15315: modelform_factory should accept widgets 
+            argument 
+        """
+        widget = forms.Textarea()
+
+        # Without a widget should not set the widget to textarea
+        Form = modelform_factory(Person)
+        assert Form.base_fields['name'].widget is not widget
+
+        # With a widget should not set the widget to textarea
+        Form = modelform_factory(Person, widgets={'name':widget})
+        self.assertTrue(Form.base_fields['name'].widget is widget)
+
     def test_custom_callback(self):
         """Test that a custom formfield_callback is used if provided"""