Ticket #14572: 14572.diff

django/contrib/contenttypes/generic.py

@@ -365 +365 @@
                                   fields=None, exclude=None,
                                   extra=3, can_order=False, can_delete=True,
                                   max_num=None,
-                                  formfield_callback=lambda f: f.formfield()):
+                                  formfield_callback=None):
     """
     Returns an ``GenericInlineFormSet`` for the given kwargs.
 
@@ -399 +399 @@
     ct_fk_field = "object_id"
     formset = BaseGenericInlineFormSet
 
-    def get_formset(self, request, obj=None):
+    def get_formset(self, request, obj=None, **kwargs):
         if self.declared_fieldsets:
             fields = flatten_fieldsets(self.declared_fieldsets)
         else:
@@ -423 +423 @@
             "max_num": self.max_num,
             "exclude": exclude
         }
+        defaults.update(kwargs)
         return generic_inlineformset_factory(self.model, **defaults)
 
 class GenericStackedInline(GenericInlineModelAdmin):

tests/modeltests/generic_relations/tests.py

@@ +1 @@
+from django import forms
 from django.contrib.contenttypes.generic import generic_inlineformset_factory
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
@@ -221 +222 @@
         formset = GenericFormSet(instance=lion, prefix='x')
         self.assertEqual(u''.join(form.as_p() for form in formset.forms), u"""<p><label for="id_x-0-tag">Tag:</label> <input id="id_x-0-tag" type="text" name="x-0-tag" maxlength="50" /></p>
 <p><label for="id_x-0-DELETE">Delete:</label> <input type="checkbox" name="x-0-DELETE" id="id_x-0-DELETE" /><input type="hidden" name="x-0-id" id="id_x-0-id" /></p>""")
+
+
+class CustomWidget(forms.CharField):
+    pass
+
+
+class TaggedItemForm(forms.ModelForm):
+    class Meta:
+        model = TaggedItem
+        widgets = {'tag': CustomWidget}
+
+
+class GenericInlineFormsetTest(TestCase):
+    """
+    Regression for #14572: Using base forms with widgets
+    defined in Meta should not raise errors.
+    """
+
+    def test_generic_inlineformset_factory(self):
+        Formset = generic_inlineformset_factory(TaggedItem, TaggedItemForm)
+        form = Formset().forms[0]
+        self.assertTrue(isinstance(form['tag'].field.widget, CustomWidget))