Ticket #8999: modeladmin-getform-and-getformset-exclude-fix-with-tests.diff

django/contrib/admin/options.py

@@ -266 +266 @@
         if self.exclude is None:
             exclude = []
         else:
-            exclude = self.exclude
+            exclude = list(self.exclude)
         defaults = {
             "form": self.form,
             "fields": fields,
-            "exclude": exclude + kwargs.get("exclude", []),
+            "exclude": exclude + list(kwargs.pop("exclude", [])),
             "formfield_callback": self.formfield_for_dbfield,
         }
         defaults.update(kwargs)
@@ -780 +780 @@
         if self.exclude is None:
             exclude = []
         else:
-            exclude = self.exclude
+            exclude = list(self.exclude)
         defaults = {
             "form": self.form,
             "formset": self.formset,
             "fk_name": self.fk_name,
             "fields": fields,
-            "exclude": exclude + kwargs.get("exclude", []),
+            "exclude": exclude + list(kwargs.pop("exclude", [])),
             "formfield_callback": self.formfield_for_dbfield,
             "extra": self.extra,
             "max_num": self.max_num,

tests/regressiontests/modeladmin/models.py

@@ -37 +37 @@
 
 __test__ = {'API_TESTS': """
 
->>> from django.contrib.admin.options import ModelAdmin, HORIZONTAL, VERTICAL
+>>> from django.contrib.admin.options import ModelAdmin, StackedInline, HORIZONTAL, VERTICAL
 >>> from django.contrib.admin.sites import AdminSite
 
 None of the following tests really depend on the content of the request, so
@@ -123 +123 @@
 >>> ma = BandAdmin(Band, site) 
 >>> ma.get_form(request).base_fields.keys() 
 ['name', 'sign_date']
- 
+
+# Using a tuple for `exclude`.
+
+>>> class BandAdmin(ModelAdmin): 
+...     exclude = ('bio',)
+>>> ma = BandAdmin(Band, site) 
+>>> ma.get_form(request).base_fields.keys() 
+['name', 'sign_date']
+
+# Combining `exclude` tuple on the class and `exclude` list as get_form parameter.
+
+>>> class BandAdmin(ModelAdmin): 
+...     exclude = ('bio',)
+>>> ma = BandAdmin(Band, site) 
+>>> ma.get_form(request, exclude=['sign_date']).base_fields.keys() 
+['name']
+
+# Combining `exclude` tuple on the class and `exclude` tuple as get_form parameter.
+
+>>> class BandAdmin(ModelAdmin): 
+...     exclude = ('bio',)
+>>> ma = BandAdmin(Band, site) 
+>>> ma.get_form(request, exclude=('sign_date',)).base_fields.keys() 
+['name']
+
 # Using `fields` and `exclude`.
 
 >>> class BandAdmin(ModelAdmin): 
@@ -133 +157 @@
 >>> ma.get_form(request).base_fields.keys() 
 ['name']
 
+# Using `exclude` on an inline admin.
+
+>>> class ConcertAdmin(StackedInline): 
+...     model = Concert
+...     fk_name = 'main_band'
+...     exclude = ['transport'] 
+>>> ma = ConcertAdmin(Band, site) 
+>>> ma.get_formset(request).form.base_fields.keys() 
+['opening_band', 'day']
+
+# Using a tuple for `exclude` on an inline admin.
+
+>>> class ConcertAdmin(StackedInline): 
+...     model = Concert
+...     fk_name = 'main_band'
+...     exclude = ('transport',)
+>>> ma = ConcertAdmin(Band, site) 
+>>> ma.get_formset(request).form.base_fields.keys() 
+['opening_band', 'day']
+
+# Combining `exclude` tuple on the class and `exclude` list as get_form parameter on inline.
+
+>>> class ConcertAdmin(StackedInline): 
+...     model = Concert
+...     fk_name = 'main_band'
+...     exclude = ['transport'] 
+>>> ma = ConcertAdmin(Band, site) 
+>>> ma.get_formset(request, exclude=['opening_band']).form.base_fields.keys() 
+['day']
+
+# Combining `exclude` tuple on the class and `exclude` tuple as get_form parameter on inline.
+
+>>> class ConcertAdmin(StackedInline): 
+...     model = Concert
+...     fk_name = 'main_band'
+...     exclude = ['transport'] 
+>>> ma = ConcertAdmin(Band, site) 
+>>> ma.get_formset(request, exclude=('opening_band',)).form.base_fields.keys() 
+['day']
+
+# Using `fields` and `exclude` on inline.
+
+>>> class ConcertAdmin(StackedInline): 
+...     model = Concert
+...     fk_name = 'main_band'
+...     fields = ['opening_band', 'transport']
+...     exclude = ['transport'] 
+>>> ma = ConcertAdmin(Band, site) 
+>>> ma.get_formset(request).form.base_fields.keys() 
+['opening_band']
+
 If we specify a form, it should use it allowing custom validation to work
 properly. This won't, however, break any of the admin widgets or media.