Fixed #11042 -- Corrected admin inlines for inherited models. Thanks to jsmullyan for the report, and mir for helpful triage work. Patch includes regression test for #8093, and a commented out test for #10992.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10725 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 47 insertions, 0 deletions

diff --git a/tests/regressiontests/admin_views/models.py b/tests/regressiontests/admin_views/models.py
index f09190b013..231d4781ce 100644
--- a/tests/regressiontests/admin_views/models.py
+++ b/tests/regressiontests/admin_views/models.py
@@ -357,6 +357,52 @@ class Recommendation(Title):
 class RecommendationAdmin(admin.ModelAdmin):
     search_fields = ('titletranslation__text', 'recommender__titletranslation__text',)
 
+class Collector(models.Model):
+    name = models.CharField(max_length=100)
+
+class Widget(models.Model):
+    owner = models.ForeignKey(Collector)
+    name = models.CharField(max_length=100)
+
+class DooHickey(models.Model):
+    code = models.CharField(max_length=10, primary_key=True)
+    owner = models.ForeignKey(Collector)
+    name = models.CharField(max_length=100)
+
+class Grommet(models.Model):
+    code = models.AutoField(primary_key=True)
+    owner = models.ForeignKey(Collector)
+    name = models.CharField(max_length=100)
+
+class Whatsit(models.Model):
+    index = models.IntegerField(primary_key=True)
+    owner = models.ForeignKey(Collector)
+    name = models.CharField(max_length=100)
+
+class Doodad(models.Model):
+    name = models.CharField(max_length=100)
+
+class FancyDoodad(Doodad):
+    owner = models.ForeignKey(Collector)
+    expensive = models.BooleanField(default=True)
+
+class WidgetInline(admin.StackedInline):
+    model = Widget
+
+class DooHickeyInline(admin.StackedInline):
+    model = DooHickey
+
+class GrommetInline(admin.StackedInline):
+    model = Grommet
+
+class WhatsitInline(admin.StackedInline):
+    model = Whatsit
+
+class FancyDoodadInline(admin.StackedInline):
+    model = FancyDoodad
+
+class CollectorAdmin(admin.ModelAdmin):
+    inlines = [WidgetInline, DooHickeyInline, GrommetInline, WhatsitInline, FancyDoodadInline]
 
 admin.site.register(Article, ArticleAdmin)
 admin.site.register(CustomArticle, CustomArticleAdmin)
@@ -379,6 +425,7 @@ admin.site.register(Picture, PictureAdmin)
 admin.site.register(Language, LanguageAdmin)
 admin.site.register(Recommendation, RecommendationAdmin)
 admin.site.register(Recommender)
+admin.site.register(Collector, CollectorAdmin)
 
 # We intentionally register Promo and ChapterXtra1 but not Chapter nor ChapterXtra2.
 # That way we cover all four cases: