Browse Source

Fixed #24411 -- Avoided dict key/method clash in admin delete views.

Tim Graham 10 năm trước cách đây
mục cha
commit
47b35b1844

+ 1 - 1
django/contrib/admin/actions.py

@@ -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,

+ 1 - 1
django/contrib/admin/options.py

@@ -1631,7 +1631,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,

+ 2 - 2
django/contrib/admin/templates/admin/includes/object_delete_summary.html

@@ -1,7 +1,7 @@
 {% 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>
+</ul>