diff options
| author | Redouane Zait <unrealdz@gmail.com> | 2014-11-23 15:08:34 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-11-25 11:27:30 -0500 |
| commit | f671905fdb678eb9fc3763d94bfe560b2d9d0b40 (patch) | |
| tree | 9f085328316a4edacf13a7a703fd6c2ea45ec00e | |
| parent | 3350531cebad22d9e65ae8ce791d92ae1de5437f (diff) | |
[1.7.x] Fixed #23898 -- Added missing context to admin's deleted_selected view.
Backport of 8e7b384d89db67e450aef1f2eb9a12703a5942e9 from master
| -rw-r--r-- | django/contrib/admin/actions.py | 21 | ||||
| -rw-r--r-- | docs/releases/1.7.2.txt | 3 | ||||
| -rw-r--r-- | tests/admin_views/tests.py | 1 |
3 files changed, 15 insertions, 10 deletions
diff --git a/django/contrib/admin/actions.py b/django/contrib/admin/actions.py index 158c436c71..e79b86a74a 100644 --- a/django/contrib/admin/actions.py +++ b/django/contrib/admin/actions.py @@ -63,16 +63,17 @@ def delete_selected(modeladmin, request, queryset): else: title = _("Are you sure?") - context = { - "title": title, - "objects_name": objects_name, - "deletable_objects": [deletable_objects], - 'queryset': queryset, - "perms_lacking": perms_needed, - "protected": protected, - "opts": opts, - 'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME, - } + context = dict( + modeladmin.admin_site.each_context(), + title=title, + objects_name=objects_name, + deletable_objects=[deletable_objects], + queryset=queryset, + perms_lacking=perms_needed, + protected=protected, + opts=opts, + action_checkbox_name=helpers.ACTION_CHECKBOX_NAME, + ) # Display the confirmation page return TemplateResponse(request, modeladmin.delete_selected_confirmation_template or [ diff --git a/docs/releases/1.7.2.txt b/docs/releases/1.7.2.txt index 62419be63e..1465db5def 100644 --- a/docs/releases/1.7.2.txt +++ b/docs/releases/1.7.2.txt @@ -80,3 +80,6 @@ Bugfixes * Fixed ``django.core.files.File.__repr__()`` when the file's ``name`` contains Unicode characters (:ticket:`23888`). + +* Added missing context to the admin's ``delete_selected`` view that prevented + custom site header, etc. from appearing (:ticket:`23898`). diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 3024faa150..2c7db8bd6b 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -830,6 +830,7 @@ class AdminCustomTemplateTests(AdminViewBasicTestCase): '_selected_action': group.id } response = self.client.post('/test_admin/%s/auth/group/' % (self.urlbit), post_data) + self.assertEqual(response.context['site_header'], 'Django administration') self.assertContains(response, 'bodyclass_consistency_check ') def test_filter_with_custom_template(self): |