Commit dfcdf64d authored by Tim Graham's avatar Tim Graham
Browse files

[1.8.x] Fixed #24411 -- Avoided dict key/method clash in admin delete views. 

Backport of 47b35b18 from master
parent 278b6987

django/contrib/admin/actions.py

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ def delete_selected(modeladmin, request, queryset): 
        title=title,

        objects_name=objects_name,

        deletable_objects=[deletable_objects],

        model_count=dict(model_count),

        model_count=dict(model_count).items(),

        queryset=queryset,

        perms_lacking=perms_needed,

        protected=protected,

django/contrib/admin/options.py

+1 −1
Original line number Diff line number Diff line
@@ -1730,7 +1730,7 @@ class ModelAdmin(BaseModelAdmin): 
            object_name=object_name,

            object=obj,

            deleted_objects=deleted_objects,

            model_count=dict(model_count),

            model_count=dict(model_count).items(),

            perms_lacking=perms_needed,

            protected=protected,

            opts=opts,

django/contrib/admin/templates/admin/includes/object_delete_summary.html

+2 −2
Original line number Diff line number Diff line 
{% load i18n %}

<h2>{% trans "Summary" %}</h2>

<ul>

    {% for model_name, object_count in model_count.items %}

    {% for model_name, object_count in model_count %}

    <li>{{ model_name|capfirst }}: {{ object_count }}</li>

    {% endfor %}

</ul>