Changeset 9276

Timestamp:

10/24/08 14:14:24 (3 months ago)

Author:

kmtracey

Message:

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 alenribic.

Files:

• django/trunk/django/contrib/admin/templates/admin/change_form.html (modified) (1 diff)
• django/trunk/tests/regressiontests/admin_views/tests.py (modified) (2 diffs)

django/trunk/django/contrib/admin/templates/admin/change_form.html

@@ -17 +17 @@
-     <a href="../../../">{% trans "Home" %}</a> &rsaquo;
-     <a href="../../">{{ app_label|capfirst|escape }}</a> &rsaquo; 
-<a href="../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
+{% if has_change_permission %}<a href="../">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} &rsaquo; 
-     {% if add %}{% trans "Add" %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %}
-</div>

django/trunk/tests/regressiontests/admin_views/tests.py

@@ -328 +328 @@
-        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> &rsaquo;'
+        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/')
@@ -336 +341 @@
-        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/')