Commit 30214532 authored by areski's avatar areski Committed by Tim Graham
Browse files

Fixed #20133 -- Added summary to admin deletion confirmation pages.

Thanks jonash for the suggestion and initial patch.
parent 2a4492ae
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ def delete_selected(modeladmin, request, queryset):

    # Populate deletable_objects, a data structure of all related objects that
    # will also be deleted.
    deletable_objects, perms_needed, protected = get_deleted_objects(
    deletable_objects, model_count, perms_needed, protected = get_deleted_objects(
        queryset, opts, request.user, modeladmin.admin_site, using)

    # The user has already confirmed the deletion.
@@ -67,6 +67,7 @@ def delete_selected(modeladmin, request, queryset):
        "title": title,
        "objects_name": objects_name,
        "deletable_objects": [deletable_objects],
        "model_count": dict(model_count),
        'queryset': queryset,
        "perms_lacking": perms_needed,
        "protected": protected,
+2 −1
Original line number Diff line number Diff line
@@ -1606,7 +1606,7 @@ class ModelAdmin(BaseModelAdmin):

        # Populate deleted_objects, a data structure of all related objects that
        # will also be deleted.
        (deleted_objects, perms_needed, protected) = get_deleted_objects(
        (deleted_objects, model_count, perms_needed, protected) = get_deleted_objects(
            [obj], opts, request.user, self.admin_site, using)

        if request.POST:  # The user has already confirmed the deletion.
@@ -1631,6 +1631,7 @@ class ModelAdmin(BaseModelAdmin):
            object_name=object_name,
            object=obj,
            deleted_objects=deleted_objects,
            model_count=dict(model_count),
            perms_lacking=perms_needed,
            protected=protected,
            opts=opts,
+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@
    </ul>
{% else %}
    <p>{% blocktrans with escaped_object=object %}Are you sure you want to delete the {{ object_name }} "{{ escaped_object }}"? All of the following related items will be deleted:{% endblocktrans %}</p>
    {% include "admin/includes/object_delete_summary.html" %}
    <h2>{% trans "Objects" %}</h2>
    <ul>{{ deleted_objects|unordered_list }}</ul>
    <form action="" method="post">{% csrf_token %}
    <div>
+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@
    </ul>
{% else %}
    <p>{% blocktrans %}Are you sure you want to delete the selected {{ objects_name }}? All of the following objects and their related items will be deleted:{% endblocktrans %}</p>
    {% include "admin/includes/object_delete_summary.html" %}
    <h2>{% trans "Objects" %}</h2>
    {% for deletable_object in deletable_objects %}
        <ul>{{ deletable_object|unordered_list }}</ul>
    {% endfor %}
+7 −0
Original line number Diff line number Diff line
{% load i18n %}
<h2>{% trans "Summary" %}</h2>
<ul>
    {% for model_name, object_count in model_count.items %}
    <li>{{ model_name|capfirst }}: {{ object_count }}</li>
    {% endfor %}
</ul>
 No newline at end of file
Loading