summaryrefslogtreecommitdiff
path: root/tests/regressiontests/generic_inline_admin/models.py
diff options
context:
space:
mode:
authorJoseph Kocherhans <joseph@jkocherhans.com>2010-02-23 17:26:20 +0000
committerJoseph Kocherhans <joseph@jkocherhans.com>2010-02-23 17:26:20 +0000
commit651082267956cef3bf3dbd48c5314046c14ca01c (patch)
tree62bc9798c14d7873b9f6238a896583be0fb8f34b /tests/regressiontests/generic_inline_admin/models.py
parentc7117b103a5a2ae50903faf2197ebafb6cd3687a (diff)
[1.1.X] Fixed #12561. InlineAdmin now respects can_delete=False. Backport of [12533] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/generic_inline_admin/models.py')
-rw-r--r--tests/regressiontests/generic_inline_admin/models.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/regressiontests/generic_inline_admin/models.py b/tests/regressiontests/generic_inline_admin/models.py
index 9f1bbadd3e..472fff9cb6 100644
--- a/tests/regressiontests/generic_inline_admin/models.py
+++ b/tests/regressiontests/generic_inline_admin/models.py
@@ -72,3 +72,15 @@ class MediaExcludeInline(generic.GenericTabularInline):
admin.site.register(EpisodeExclude, inlines=[MediaExcludeInline])
+#
+# Generic inline with can_delete=False
+#
+
+class EpisodePermanent(Episode):
+ pass
+
+class MediaPermanentInline(generic.GenericTabularInline):
+ model = Media
+ can_delete = False
+
+admin.site.register(EpisodePermanent, inlines=[MediaPermanentInline])