Ticket #1089: patch.diff

django/contrib/admin/views/main.py

@@ -646 +646 @@
         log.log_action(request.user.id, opts.get_content_type_id(), object_id, obj_display, log.DELETION)
         request.user.add_message(_('The %(name)s "%(obj)s" was deleted successfully.') % {'name':opts.verbose_name, 'obj':obj_display})
         return HttpResponseRedirect("../../")
-    return render_to_response('admin/delete_confirmation', {
+    extra_context = {
         "title": _("Are you sure?"),
         "object_name": opts.verbose_name,
         "object": obj,
         "deleted_objects": deleted_objects,
         "perms_lacking": perms_needed,
-    }, context_instance=Context(request))
+    }
+    return render_to_response(["admin/%s/%s/delete_confirmation" % (app_label, opts.object_name.lower() ),
+                               "admin/%s/delete_confirmation" % app_label ,
+                               "admin/delete_confirmation"], extra_context, context_instance=Context(request))
 delete_stage = staff_member_required(delete_stage)
 
 def history(request, app_label, module_name, object_id):
@@ -661 +664 @@
         order_by=("action_time",), select_related=True)
     # If no history was found, see whether this object even exists.
     obj = get_object_or_404(mod, pk=object_id)
-    return render_to_response('admin/object_history', {
+    extra_context = {
         'title': _('Change history: %s') % obj,
         'action_list': action_list,
         'module_name': capfirst(opts.verbose_name_plural),
         'object': obj,
-    }, context_instance=Context(request))
+    }
+    return render_to_response(["admin/%s/%s/object_history" % (app_label, opts.object_name.lower() ),
+                               "admin/%s/object_history" % app_label ,
+                               "admin/object_history"], extra_context, context_instance=Context(request))
 history = staff_member_required(history)