mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

Fix for #1089: Allow overrides of delete_confirmation and object_history,

Browse Source 
patch supplied by Joseph Kocherhans.


git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2416 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Duncan Foster 2006-02-27 21:03:19 +00:00
parent 16387552c1
commit e9e18209cd
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
django/contrib/admin/views/main.py
View File

@ -456,13 +456,16 @@ def delete_stage(request, app_label, model_name, object_id):
LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(model).id, object_id, obj_display, DELETION) LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(model).id, object_id, obj_display, DELETION)
request.user.message_set.add(message=_('The %(name)s "%(obj)s" was deleted successfully.') % {'name': opts.verbose_name, 'obj': obj_display}) request.user.message_set.add(message=_('The %(name)s "%(obj)s" was deleted successfully.') % {'name': opts.verbose_name, 'obj': obj_display})
return HttpResponseRedirect("../../") return HttpResponseRedirect("../../")
return render_to_response('admin/delete_confirmation', { extra_context = {
"title": _("Are you sure?"), "title": _("Are you sure?"),
"object_name": opts.verbose_name, "object_name": opts.verbose_name,
"object": obj, "object": obj,
"deleted_objects": deleted_objects, "deleted_objects": deleted_objects,
"perms_lacking": perms_needed, "perms_lacking": perms_needed,
}, context_instance=template.RequestContext(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) delete_stage = staff_member_required(delete_stage)
def history(request, app_label, model_name, object_id): def history(request, app_label, model_name, object_id):
@ -473,12 +476,15 @@ def history(request, app_label, model_name, object_id):
content_type__id__exact=ContentType.objects.get_for_model(model).id).select_related().order_by('action_time') content_type__id__exact=ContentType.objects.get_for_model(model).id).select_related().order_by('action_time')
# If no history was found, see whether this object even exists. # If no history was found, see whether this object even exists.
obj = get_object_or_404(model, pk=object_id) obj = get_object_or_404(model, pk=object_id)
return render_to_response('admin/object_history', { extra_context = {
'title': _('Change history: %s') % obj, 'title': _('Change history: %s') % obj,
'action_list': action_list, 'action_list': action_list,
'module_name': capfirst(model._meta.verbose_name_plural), 'module_name': capfirst(model._meta.verbose_name_plural),
'object': obj, 'object': obj,
}, context_instance=template.RequestContext(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) history = staff_member_required(history)
class ChangeList(object): class ChangeList(object):