Django

Code

Changeset 2416

Show
Ignore:
Timestamp:
02/27/06 15:03:19 (3 years ago)
Author:
dcf
Message:

Fix for #1089: Allow overrides of delete_confirmation and object_history,
patch supplied by Joseph Kocherhans.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/magic-removal/django/contrib/admin/views/main.py

    r2395 r2416  
    457457        request.user.message_set.add(message=_('The %(name)s "%(obj)s" was deleted successfully.') % {'name': opts.verbose_name, 'obj': obj_display}) 
    458458        return HttpResponseRedirect("../../") 
    459     return render_to_response('admin/delete_confirmation', { 
     459    extra_context = { 
    460460        "title": _("Are you sure?"), 
    461461        "object_name": opts.verbose_name, 
    …… 
    463463        "deleted_objects": deleted_objects, 
    464464        "perms_lacking": perms_needed, 
    465     }, context_instance=template.RequestContext(request)) 
     465    } 
     466    return render_to_response(["admin/%s/%s/delete_confirmation" % (app_label, opts.object_name.lower() ), 
     467                               "admin/%s/delete_confirmation" % app_label , 
     468                               "admin/delete_confirmation"], extra_context, context_instance=Context(request))  
    466469delete_stage = staff_member_required(delete_stage) 
    467470 
    …… 
    474477    # If no history was found, see whether this object even exists. 
    475478    obj = get_object_or_404(model, pk=object_id) 
    476     return render_to_response('admin/object_history', { 
     479    extra_context = { 
    477480        'title': _('Change history: %s') % obj, 
    478481        'action_list': action_list, 
    479482        'module_name': capfirst(model._meta.verbose_name_plural), 
    480483        'object': obj, 
    481     }, context_instance=template.RequestContext(request)) 
     484    } 
     485    return render_to_response(["admin/%s/%s/object_history" % (app_label, opts.object_name.lower() ), 
     486                               "admin/%s/object_history" % app_label , 
     487                               "admin/object_history"], extra_context, context_instance=Context(request))  
    482488history = staff_member_required(history) 
    483489