diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-04-05 12:08:45 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-04-05 12:08:45 +0000 |
| commit | c01735dee7dd590963c0305a2f2c904cd6cdefc2 (patch) | |
| tree | aeaeaa4bbdccffbcaf50f70c23ba729c9f3628a4 /django | |
| parent | 0d6a776ccd9a6035b97389ca57fee41dd7454e01 (diff) | |
[1.1.X] Fixed #11949 -- Added a hook to allow ModelAdmin customization of the delete selected template. Thanks to bendavis78 for the report and patch, and Ramiro Morales for his cleanup work.
Backport of r12916 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/actions.py | 2 | ||||
| -rw-r--r-- | django/contrib/admin/options.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/admin/actions.py b/django/contrib/admin/actions.py index 8d03c6ce5a..b75c91b75a 100644 --- a/django/contrib/admin/actions.py +++ b/django/contrib/admin/actions.py @@ -64,7 +64,7 @@ def delete_selected(modeladmin, request, queryset): } # Display the confirmation page - return render_to_response(modeladmin.delete_confirmation_template or [ + return render_to_response(modeladmin.delete_selected_confirmation_template or [ "admin/%s/%s/delete_selected_confirmation.html" % (app_label, opts.object_name.lower()), "admin/%s/delete_selected_confirmation.html" % app_label, "admin/delete_selected_confirmation.html" diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 4fb1679ebe..44d5d0b7f1 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -189,6 +189,7 @@ class ModelAdmin(BaseModelAdmin): change_form_template = None change_list_template = None delete_confirmation_template = None + delete_selected_confirmation_template = None object_history_template = None # Actions |