Ticket #8999: modeladmin-getform-and-getformset-exclude-will-overwrite.diff

django/contrib/admin/options.py

@@ -352 +352 @@
             exclude = []
         else:
             exclude = list(self.exclude)
-        exclude.extend(kwargs.get("exclude", []))
         exclude.extend(self.get_readonly_fields(request, obj))
         # if exclude is an empty list we pass None to be consistant with the
         # default on modelform_factory
@@ -1244 +1243 @@
             exclude = []
         else:
             exclude = list(self.exclude)
-        exclude.extend(kwargs.get("exclude", []))
         exclude.extend(self.get_readonly_fields(request, obj))
         # if exclude is an empty list we use None, since that's the actual
         # default

tests/regressiontests/modeladmin/models.py

@@ -141 +141 @@
 >>> ma.get_form(request).base_fields.keys() 
 ['name']
 
+# Passing `exclude` to get_form as a keyword argument will override the
+# value generated by the method, disregarding the `exclude` and
+# `readonly_fields` attributes on the ModelAdmin instance.
+
+>>> class BandAdmin(ModelAdmin):
+...     fields = ['name', 'bio', 'sign_date']
+...     exclude = ['bio']
+...     readonly_fields = ['sign_date']
+>>> ma = BandAdmin(Band, site)
+>>> ma.get_form(request, exclude=['name']).base_fields.keys()
+['bio', 'sign_date']
+
 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.
 
@@ -302 +314 @@
 >>> list(ma.get_formsets(request))[0]().forms[0].fields.keys()
 ['extra', 'transport', 'id', 'DELETE', 'main_band']
 
+# Using `exclude` on InlineModelAdmin.get_formset
+>>> ma.inline_instances[0].get_formset(request, exclude=['transport']).form.base_fields.keys()
+['extra', 'main_band']
+
 
 >>> band.delete()