Ticket #15907: 15907_at_16452.diff

django/contrib/contenttypes/generic.py

@@ -382 +382 @@
         exclude.extend([ct_field.name, fk_field.name])
     else:
         exclude = [ct_field.name, fk_field.name]
+        if hasattr(form, 'Meta') and hasattr(form.Meta, 'exclude'):
+            exclude.extend(list(form.Meta.exclude))
+
     FormSet = modelformset_factory(model, form=form,
                                    formfield_callback=formfield_callback,
                                    formset=formset,

tests/regressiontests/generic_inline_admin/models.py

@@ -2 +2 @@
 from django.contrib import admin
 from django.contrib.contenttypes import generic
 from django.contrib.contenttypes.models import ContentType
+from django.forms.models import ModelForm
 
 class Episode(models.Model):
     name = models.CharField(max_length=100)
@@ -73 +74 @@
 admin.site.register(EpisodeExclude, inlines=[MediaExcludeInline])
 
 #
+# Generic inline with modelform and exclude
+#
+
+class Sitcom(Episode):
+    pass
+
+class MediaForm(ModelForm):
+    class Meta:
+        model = Media
+        exclude = ('url',)
+
+class MediaInline(generic.GenericTabularInline):
+    form = MediaForm
+    model = Media
+    extra = 1
+
+class SitcomAdmin(admin.ModelAdmin):
+    inlines = (MediaInline, )
+
+admin.site.register(Sitcom, SitcomAdmin)
+
+
+#
 # Generic inline with unique_together
 #
 

tests/regressiontests/generic_inline_admin/tests.py

@@ -7 +7 @@
 
 # local test models
 from models import (Episode, EpisodeExtra, EpisodeMaxNum, EpisodeExclude,
-    Media, MediaInline, EpisodePermanent, MediaPermanentInline, Category)
+    Media, MediaInline, EpisodePermanent, MediaPermanentInline, Category,
+    Sitcom)
 
 
 class GenericAdminViewTest(TestCase):
@@ -182 +183 @@
         formset = response.context['inline_admin_formsets'][0].formset
         self.assertFalse('url' in formset.forms[0], 'The formset has excluded "url" field.')
 
+    def testModelFormExcludeParam(self):
+        """
+        Generic inline formsets should respect exclude on model forms.
+        """
+        e = self._create_object(Sitcom)
+        response = self.client.get('/generic_inline_admin/admin/generic_inline_admin/sitcom/%s/' % e.pk)
+        formset = response.context['inline_admin_formsets'][0].formset
+        self.assertFalse('url' in formset.forms[0].fields, 'The formset has excluded "url" field.')
+
 class GenericInlineAdminWithUniqueTogetherTest(TestCase):
     fixtures = ['users.xml']