diff options
| author | Joseph Kocherhans <joseph@jkocherhans.com> | 2010-02-23 17:14:50 +0000 |
|---|---|---|
| committer | Joseph Kocherhans <joseph@jkocherhans.com> | 2010-02-23 17:14:50 +0000 |
| commit | f2d5582c53f9b667f482842cbb3213db91d35d5e (patch) | |
| tree | b5972eb5ab7f28191181a882fcc0389ba309522f /tests/regressiontests/generic_inline_admin | |
| parent | 10b187144169b93ab913d90d218fe4cbfbf507bf (diff) | |
Fixed #12561. InlineAdmin now respects can_delete=False. Thanks, nessita.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12533 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/generic_inline_admin')
| -rw-r--r-- | tests/regressiontests/generic_inline_admin/models.py | 13 | ||||
| -rw-r--r-- | tests/regressiontests/generic_inline_admin/tests.py | 11 |
2 files changed, 23 insertions, 1 deletions
diff --git a/tests/regressiontests/generic_inline_admin/models.py b/tests/regressiontests/generic_inline_admin/models.py index 2925b7a801..329c4877eb 100644 --- a/tests/regressiontests/generic_inline_admin/models.py +++ b/tests/regressiontests/generic_inline_admin/models.py @@ -93,3 +93,16 @@ class PhoneNumberInline(generic.GenericTabularInline): model = PhoneNumber admin.site.register(Contact, inlines=[PhoneNumberInline]) + +# +# 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]) diff --git a/tests/regressiontests/generic_inline_admin/tests.py b/tests/regressiontests/generic_inline_admin/tests.py index 6853a896a4..0626699292 100644 --- a/tests/regressiontests/generic_inline_admin/tests.py +++ b/tests/regressiontests/generic_inline_admin/tests.py @@ -5,7 +5,8 @@ from django.conf import settings from django.contrib.contenttypes.generic import generic_inlineformset_factory # local test models -from models import Episode, EpisodeExtra, EpisodeMaxNum, EpisodeExclude, Media +from models import Episode, EpisodeExtra, EpisodeMaxNum, EpisodeExclude, \ + Media, EpisodePermanent, MediaPermanentInline class GenericAdminViewTest(TestCase): fixtures = ['users.xml'] @@ -201,3 +202,11 @@ class GenericInlineAdminWithUniqueTogetherTest(TestCase): response = self.client.get('/generic_inline_admin/admin/generic_inline_admin/contact/add/') response = self.client.post('/generic_inline_admin/admin/generic_inline_admin/contact/add/', post_data) self.failUnlessEqual(response.status_code, 302) # redirect somewhere + +class NoInlineDeletionTest(TestCase): + def test_no_deletion(self): + fake_site = object() + inline = MediaPermanentInline(EpisodePermanent, fake_site) + fake_request = object() + formset = inline.get_formset(fake_request) + self.assertFalse(formset.can_delete) |