p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Backport of 47b35b1844 from master
This commit is contained in:
Tim Graham 2015-02-25 07:15:56 -05:00
parent 278b698794
commit dfcdf64d47
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/actions.py
View File

@ -68,7 +68,7 @@ def delete_selected(modeladmin, request, queryset):
title=title, title=title,
objects_name=objects_name, objects_name=objects_name,
deletable_objects=[deletable_objects], deletable_objects=[deletable_objects],
model_count=dict(model_count), model_count=dict(model_count).items(),
queryset=queryset, queryset=queryset,
perms_lacking=perms_needed, perms_lacking=perms_needed,
protected=protected, protected=protected,

2
django/contrib/admin/options.py
View File

@ -1730,7 +1730,7 @@ class ModelAdmin(BaseModelAdmin):
object_name=object_name, object_name=object_name,
object=obj, object=obj,
deleted_objects=deleted_objects, deleted_objects=deleted_objects,
model_count=dict(model_count), model_count=dict(model_count).items(),
perms_lacking=perms_needed, perms_lacking=perms_needed,
protected=protected, protected=protected,
opts=opts, opts=opts,

4
django/contrib/admin/templates/admin/includes/object_delete_summary.html
View File

@ -1,7 +1,7 @@
{% load i18n %} {% load i18n %}
<h2>{% trans "Summary" %}</h2> <h2>{% trans "Summary" %}</h2>
<ul> <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> <li>{{ model_name|capfirst }}: {{ object_count }}</li>
{% endfor %} {% endfor %}
</ul> </ul>