Ticket #9932: patch_django_9932.20081230.diff

django_src/django/contrib/admin/validation.py

@@ -5 +5 @@
 
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
-from django.forms.models import BaseModelForm, BaseModelFormSet, fields_for_model
+from django.forms.models import BaseModelForm, BaseModelFormSet, fields_for_model, _get_foreign_key
 from django.contrib.admin.options import flatten_fieldsets, BaseModelAdmin
 from django.contrib.admin.options import HORIZONTAL, VERTICAL
 
@@ -117 +117 @@
                 raise ImproperlyConfigured("'%s.inlines[%d].model' does not "
                         "inherit from models.Model." % (cls.__name__, idx))
             validate_base(inline, inline.model)
-            validate_inline(inline)
+            validate_inline(inline, cls, model)
 
-def validate_inline(cls):
+def validate_inline(cls, parent, parent_model):
     # model is already verified to exist and be a Model
     if cls.fk_name: # default value is None
         f = get_field(cls, cls.model, cls.model._meta, 'fk_name', cls.fk_name)
@@ -138 +138 @@
         raise ImproperlyConfigured("'%s.formset' does not inherit from "
                 "BaseModelFormSet." % cls.__name__)
 
+    # exclude
+    if hasattr(cls, 'exclude') and cls.exclude:
+        fk_name = _get_foreign_key(parent_model, cls.model).name
+        if fk_name in cls.exclude:
+            raise ImproperlyConfigured("'%s.exclude' should not contain "
+                    "'%s' key because it's used in "
+                    "%s." % (cls.__name__, fk_name, parent.__name__))
+
 def validate_base(cls, model):
     opts = model._meta
 

django_src/tests/regressiontests/admin_validation/models.py

@@ -4 +4 @@
 
 from django.db import models
 
+class Album(models.Model):
+    title = models.CharField(max_length=150)
+
 class Song(models.Model):
     title = models.CharField(max_length=150)
+    first_album = models.ForeignKey(Album)
     
     class Meta:
         ordering = ('title',)
@@ -40 +44 @@
     ...
 ImproperlyConfigured: 'InvalidFields.fields' refers to field 'spam' that is missing from the form.
 
+#
+# exclude in InlineModelAdmin should not contain a ForeignKey field used in
+# ModelAdmin.model
+#
+
+>>> class SongInline(admin.StackedInline):
+...     model = Song
+...     exclude = ['first_album']
+
+>>> class AlbumAdmin(admin.ModelAdmin):
+...     model = Album
+...     inlines = [SongInline]
+
+>>> validate(AlbumAdmin, Album)
+Traceback (most recent call last):
+    ...
+ImproperlyConfigured: 'SongInline.exclude' should not contain 'first_album' key because it's used in AlbumAdmin.
+
 """}