diff options
| author | Karen Tracey <kmtracey@gmail.com> | 2008-10-24 19:14:24 +0000 |
|---|---|---|
| committer | Karen Tracey <kmtracey@gmail.com> | 2008-10-24 19:14:24 +0000 |
| commit | 03070a9955775017d2e313a851c435bc85041ced (patch) | |
| tree | 84660cf500dbabd1169cb3d41a754104a9c6d819 | |
| parent | 3dfbaae32b2e87fd1f47b569f973fb3f76602137 (diff) | |
Fixed #7179 -- Changed breadcrumbs on the add page so that a link to the change view is not included when the user doesn't have permission for that view. Also added tests to ensure the link is not there when it shouldn't be, and there when it should be. Thanks for the report & patch alen__ribic.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/templates/admin/change_form.html | 2 | ||||
| -rw-r--r-- | tests/regressiontests/admin_views/tests.py | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index f367973820..ca9db6c1c6 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -16,7 +16,7 @@ <div class="breadcrumbs"> <a href="../../../">{% trans "Home" %}</a> › <a href="../../">{{ app_label|capfirst|escape }}</a> › - <a href="../">{{ opts.verbose_name_plural|capfirst }}</a> › + {% if has_change_permission %}<a href="../">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} › {% if add %}{% trans "Add" %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %} </div> {% endif %}{% endblock %} diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py index f335c093de..26d807e731 100644 --- a/tests/regressiontests/admin_views/tests.py +++ b/tests/regressiontests/admin_views/tests.py @@ -327,6 +327,11 @@ class AdminViewPermissionsTest(TestCase): # Add user may login and POST to add view, then redirect to admin root self.client.get('/test_admin/admin/') self.client.post('/test_admin/admin/', self.adduser_login) + addpage = self.client.get('/test_admin/admin/admin_views/article/add/') + self.failUnlessEqual(addpage.status_code, 200) + change_list_link = '<a href="../">Articles</a> ›' + self.failIf(change_list_link in addpage.content, + 'User restricted to add permission is given link to change list view in breadcrumbs.') post = self.client.post('/test_admin/admin/admin_views/article/add/', add_dict) self.assertRedirects(post, '/test_admin/admin/') self.failUnlessEqual(Article.objects.all().count(), 4) @@ -335,6 +340,10 @@ class AdminViewPermissionsTest(TestCase): # Super can add too, but is redirected to the change list view self.client.get('/test_admin/admin/') self.client.post('/test_admin/admin/', self.super_login) + addpage = self.client.get('/test_admin/admin/admin_views/article/add/') + self.failUnlessEqual(addpage.status_code, 200) + self.failIf(change_list_link not in addpage.content, + 'Unrestricted user is not given link to change list view in breadcrumbs.') post = self.client.post('/test_admin/admin/admin_views/article/add/', add_dict) self.assertRedirects(post, '/test_admin/admin/admin_views/article/') self.failUnlessEqual(Article.objects.all().count(), 5) |