From 59f47eaf1f8c498b20c9cf908377350d747fcfb8 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Tue, 11 Apr 2006 03:10:12 +0000 Subject: [PATCH] magic-removal: Fixed #1571 -- Added missing breadcrumbs to admin delete-confirmation page. Thanks for reporting, bryan at fullfactor dot com git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2662 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../admin/templates/admin/delete_confirmation.html | 8 ++++++++ django/contrib/admin/views/main.py | 1 + 2 files changed, 9 insertions(+) diff --git a/django/contrib/admin/templates/admin/delete_confirmation.html b/django/contrib/admin/templates/admin/delete_confirmation.html index 894b99c74e..29a435a12b 100644 --- a/django/contrib/admin/templates/admin/delete_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_confirmation.html @@ -1,6 +1,14 @@ {% extends "admin/base_site" %} {% load i18n %} {% block userlinks %}{% trans 'Documentation' %} / {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} +{% block breadcrumbs %} + +{% endblock %} {% block content %} {% if perms_lacking %}

{% blocktrans %}Deleting the {{ object_name }} '{{ object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}

diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index 96f30e7c5b..9c274d7cb0 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -513,6 +513,7 @@ def delete_stage(request, app_label, model_name, object_id): "object": obj, "deleted_objects": deleted_objects, "perms_lacking": perms_needed, + "opts": model._meta, } return render_to_response(["admin/%s/%s/delete_confirmation" % (app_label, opts.object_name.lower() ), "admin/%s/delete_confirmation" % app_label ,