[1.7.x] Fixed #23898 -- Added missing context to admin's deleted_selected view.
Backport of 8e7b384d89db67e450aef1f2eb9a12703a5942e9 from master
This commit is contained in:
parent
3350531ceb
commit
f671905fdb
@ -63,16 +63,17 @@ def delete_selected(modeladmin, request, queryset):
|
|||||||
else:
|
else:
|
||||||
title = _("Are you sure?")
|
title = _("Are you sure?")
|
||||||
|
|
||||||
context = {
|
context = dict(
|
||||||
"title": title,
|
modeladmin.admin_site.each_context(),
|
||||||
"objects_name": objects_name,
|
title=title,
|
||||||
"deletable_objects": [deletable_objects],
|
objects_name=objects_name,
|
||||||
'queryset': queryset,
|
deletable_objects=[deletable_objects],
|
||||||
"perms_lacking": perms_needed,
|
queryset=queryset,
|
||||||
"protected": protected,
|
perms_lacking=perms_needed,
|
||||||
"opts": opts,
|
protected=protected,
|
||||||
'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME,
|
opts=opts,
|
||||||
}
|
action_checkbox_name=helpers.ACTION_CHECKBOX_NAME,
|
||||||
|
)
|
||||||
|
|
||||||
# Display the confirmation page
|
# Display the confirmation page
|
||||||
return TemplateResponse(request, modeladmin.delete_selected_confirmation_template or [
|
return TemplateResponse(request, modeladmin.delete_selected_confirmation_template or [
|
||||||
|
@ -80,3 +80,6 @@ Bugfixes
|
|||||||
|
|
||||||
* Fixed ``django.core.files.File.__repr__()`` when the file's ``name`` contains
|
* Fixed ``django.core.files.File.__repr__()`` when the file's ``name`` contains
|
||||||
Unicode characters (:ticket:`23888`).
|
Unicode characters (:ticket:`23888`).
|
||||||
|
|
||||||
|
* Added missing context to the admin's ``delete_selected`` view that prevented
|
||||||
|
custom site header, etc. from appearing (:ticket:`23898`).
|
||||||
|
@ -830,6 +830,7 @@ class AdminCustomTemplateTests(AdminViewBasicTestCase):
|
|||||||
'_selected_action': group.id
|
'_selected_action': group.id
|
||||||
}
|
}
|
||||||
response = self.client.post('/test_admin/%s/auth/group/' % (self.urlbit), post_data)
|
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 ')
|
self.assertContains(response, 'bodyclass_consistency_check ')
|
||||||
|
|
||||||
def test_filter_with_custom_template(self):
|
def test_filter_with_custom_template(self):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user