Ticket #15907: 15907_patch_at_r16141.diff

django/forms/models.py

@@ -384 +384 @@
     # creating needs to inherit from the parent's inner meta.
     parent = (object,)
     if hasattr(form, 'Meta'):
+        if 'exclude' in attrs and hasattr(form.Meta, 'exclude'):
+            all_exclude = tuple(attrs['exclude']) + tuple(form.Meta.exclude)
+            attrs['exclude'] = tuple(set(all_exclude))
         parent = (form.Meta, object)
     Meta = type('Meta', parent, attrs)
 

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 custom modelform and exclude
+#
+
+class EpisodeModelFormExclude(Episode):
+    pass
+
+class ModelFormWithExclude(ModelForm):
+    class Meta:
+        model = Media
+        exclude = ('url',)
+
+class MediaWithModelFormExcludeInline(generic.GenericTabularInline):
+    form = ModelFormWithExclude
+    model = Media
+    extra = 1
+
+class EpisodeModelFormExcludeAdmin(admin.ModelAdmin):
+    inlines = (MediaWithModelFormExcludeInline, )
+
+admin.site.register(EpisodeModelFormExclude, EpisodeModelFormExcludeAdmin)
+
+#
 # Generic inline with unique_together
 #
 

tests/regressiontests/generic_inline_admin/tests.py

@@ -6 +6 @@
 
 # local test models
 from models import Episode, EpisodeExtra, EpisodeMaxNum, EpisodeExclude, \
-                   Media, EpisodePermanent, MediaPermanentInline, Category
+                   EpisodeModelFormExclude, Media, EpisodePermanent, \
+                   MediaPermanentInline, Category
 
 
 class GenericAdminViewTest(TestCase):
@@ -181 +182 @@
         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 custom model forms.
+        """
+        e = self._create_object(EpisodeModelFormExclude)
+        response = self.client.get('/generic_inline_admin/admin/generic_inline_admin/episodemodelformexclude/%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']