Ticket #10208: fix_10208.diff

django/contrib/admin/options.py

@@ -318 +318 @@
             fields = flatten_fieldsets(self.declared_fieldsets)
         else:
             fields = None
-        if self.exclude is None:
+        if self.exclude is not None:
+            exclude = list(self.exclude)
+        elif hasattr(self.form, '_meta') and self.form._meta.exclude is not None:
+            exclude = list(self.form._meta.exclude)
+        else:
             exclude = []
-        else:
-            exclude = list(self.exclude)
+            
         defaults = {
             "form": self.form,
             "fields": fields,

tests/regressiontests/modeladmin/models.py

@@ -187 +187 @@
 
 >>> band2.delete()
 
+>>> class AdminConcertForm(forms.ModelForm):
+...     class Meta:
+...         model = Concert
+...         exclude = ('transport', )
+...
+...     def __init__(self, *args, **kwargs):
+...         super(AdminConcertForm, self).__init__(*args, **kwargs)
+
+>>> class ConcertAdmin(ModelAdmin):
+...     form = AdminConcertForm
+
+>>> ma = ConcertAdmin(Concert, site)
+>>> ma.get_form(request).base_fields.keys() 
+['main_band', 'opening_band', 'day']
+
 # radio_fields behavior ################################################
 
 First, without any radio_fields specified, the widgets for ForeignKey