Commit 8e7b384d authored by Redouane Zait's avatar Redouane Zait Committed by Tim Graham
Browse files

Fixed #23898 -- Added missing context to admin's deleted_selected view. 

Thanks Redouane Zait for the report.
parent 392e1194

django/contrib/admin/actions.py

+12 −11
Original line number Diff line number Diff line
@@ -63,17 +63,18 @@ def delete_selected(modeladmin, request, queryset): 
    else:

        title = _("Are you sure?")



    context = {

        "title": title,

        "objects_name": objects_name,

        "deletable_objects": [deletable_objects],

        "model_count": dict(model_count),

        '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],

        model_count=dict(model_count),

        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 [

docs/releases/1.7.2.txt

+3 −0
Original line number Diff line number Diff line
@@ -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`).

tests/admin_views/tests.py

+1 −0
Original line number Diff line number Diff line
@@ -838,6 +838,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):