Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #15315 -- Added support for the 'widget' argument to modelform_…

…factory. Thanks to SardarNL and Will Hardy for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit a5cbb892f8206c8f4ae8fd1bcff93b8251e6264e 1 parent 1f770c6
Russell Keith-Magee freakboy3742 authored
4 django/forms/models.py
View
@@ -368,7 +368,7 @@ class ModelForm(BaseModelForm):
__metaclass__ = ModelFormMetaclass
def modelform_factory(model, form=ModelForm, fields=None, exclude=None,
- formfield_callback=None):
+ formfield_callback=None, widgets=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,6 +379,8 @@ def modelform_factory(model, form=ModelForm, fields=None, exclude=None,
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.
14 tests/regressiontests/model_forms_regress/tests.py
View
@@ -275,6 +275,20 @@ class Meta:
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)
+ self.assertNotEqual(Form.base_fields['name'].widget.__class__, forms.Textarea)
+
+ # With a widget should not set the widget to textarea
+ Form = modelform_factory(Person, widgets={'name':widget})
+ self.assertEqual(Form.base_fields['name'].widget.__class__, forms.Textarea)
+
def test_custom_callback(self):
"""Test that a custom formfield_callback is used if provided"""
Please sign in to comment.
Something went wrong with that request. Please try again.