-
-
Notifications
You must be signed in to change notification settings - Fork 31.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[1.1.X] Fixed #12561. InlineAdmin now respects can_delete=False. Back…
…port of [12533] from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
- Loading branch information
1 parent
c7117b1
commit 6510822
Showing
9 changed files
with
94 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
tests/regressiontests/admin_inlines/fixtures/admin-views-users.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<django-objects version="1.0"> | ||
<object pk="100" model="auth.user"> | ||
<field type="CharField" name="username">super</field> | ||
<field type="CharField" name="first_name">Super</field> | ||
<field type="CharField" name="last_name">User</field> | ||
<field type="CharField" name="email">super@example.com</field> | ||
<field type="CharField" name="password">sha1$995a3$6011485ea3834267d719b4c801409b8b1ddd0158</field> | ||
<field type="BooleanField" name="is_staff">True</field> | ||
<field type="BooleanField" name="is_active">True</field> | ||
<field type="BooleanField" name="is_superuser">True</field> | ||
<field type="DateTimeField" name="last_login">2007-05-30 13:20:10</field> | ||
<field type="DateTimeField" name="date_joined">2007-05-30 13:20:10</field> | ||
<field to="auth.group" name="groups" rel="ManyToManyRel"></field> | ||
<field to="auth.permission" name="user_permissions" rel="ManyToManyRel"></field> | ||
</object> | ||
</django-objects> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
from django.test import TestCase | ||
|
||
# local test models | ||
from models import Holder, Inner, InnerInline | ||
|
||
class TestInline(TestCase): | ||
fixtures = ['admin-views-users.xml'] | ||
|
||
def setUp(self): | ||
holder = Holder(dummy=13) | ||
holder.save() | ||
Inner(dummy=42, holder=holder).save() | ||
self.change_url = '/test_admin/admin/admin_inlines/holder/%i/' % holder.id | ||
|
||
result = self.client.login(username='super', password='secret') | ||
self.failUnlessEqual(result, True) | ||
|
||
def tearDown(self): | ||
self.client.logout() | ||
|
||
def test_can_delete(self): | ||
""" | ||
can_delete should be passed to inlineformset factory. | ||
""" | ||
response = self.client.get(self.change_url) | ||
inner_formset = response.context[-1]['inline_admin_formsets'][0].formset | ||
expected = InnerInline.can_delete | ||
actual = inner_formset.can_delete | ||
self.assertEqual(expected, actual, 'can_delete must be equal') | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters