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

magic-removal: Fixed #1416 -- Fixed admin to use .create() rather than .add() for related objects. Thanks, nesh

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-02-28 14:22:33 +00:00
parent d26558ebf3
commit 10d7f00b38
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,7 +249,7 @@ def add_stage(request, app_label, model_name, show_delete=False, form_url='', po
# Here, we distinguish between different save types by checking for # Here, we distinguish between different save types by checking for
# the presence of keys in request.POST. # the presence of keys in request.POST.
if request.POST.has_key("_continue"): if request.POST.has_key("_continue"):
request.user.message_set.add(message=msg + ' ' + _("You may edit it again below.")) request.user.message_set.create(message=msg + ' ' + _("You may edit it again below."))
if request.POST.has_key("_popup"): if request.POST.has_key("_popup"):
post_url_continue += "?_popup=1" post_url_continue += "?_popup=1"
return HttpResponseRedirect(post_url_continue % pk_value) return HttpResponseRedirect(post_url_continue % pk_value)
@ -257,10 +257,10 @@ def add_stage(request, app_label, model_name, show_delete=False, form_url='', po
return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, %s, "%s");</script>' % \ return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, %s, "%s");</script>' % \
(pk_value, str(new_object).replace('"', '\\"'))) (pk_value, str(new_object).replace('"', '\\"')))
elif request.POST.has_key("_addanother"): elif request.POST.has_key("_addanother"):
request.user.message_set.add(message=msg + ' ' + (_("You may add another %s below.") % opts.verbose_name)) request.user.message_set.create(message=msg + ' ' + (_("You may add another %s below.") % opts.verbose_name))
return HttpResponseRedirect(request.path) return HttpResponseRedirect(request.path)
else: else:
request.user.message_set.add(message=msg) request.user.message_set.create(message=msg)
return HttpResponseRedirect(post_url) return HttpResponseRedirect(post_url)
else: else:
# Add default data. # Add default data.
@ -333,19 +333,19 @@ def change_stage(request, app_label, model_name, object_id):
msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': opts.verbose_name, 'obj': new_object} msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': opts.verbose_name, 'obj': new_object}
if request.POST.has_key("_continue"): if request.POST.has_key("_continue"):
request.user.message_set.add(message=msg + ' ' + _("You may edit it again below.")) request.user.message_set.create(message=msg + ' ' + _("You may edit it again below."))
if request.REQUEST.has_key('_popup'): if request.REQUEST.has_key('_popup'):
return HttpResponseRedirect(request.path + "?_popup=1") return HttpResponseRedirect(request.path + "?_popup=1")
else: else:
return HttpResponseRedirect(request.path) return HttpResponseRedirect(request.path)
elif request.POST.has_key("_saveasnew"): elif request.POST.has_key("_saveasnew"):
request.user.message_set.add(message=_('The %(name)s "%(obj)s" was added successfully. You may edit it again below.') % {'name': opts.verbose_name, 'obj': new_object}) request.user.message_set.create(message=_('The %(name)s "%(obj)s" was added successfully. You may edit it again below.') % {'name': opts.verbose_name, 'obj': new_object})
return HttpResponseRedirect("../%s/" % pk_value) return HttpResponseRedirect("../%s/" % pk_value)
elif request.POST.has_key("_addanother"): elif request.POST.has_key("_addanother"):
request.user.message_set.add(message=msg + ' ' + (_("You may add another %s below.") % opts.verbose_name)) request.user.message_set.create(message=msg + ' ' + (_("You may add another %s below.") % opts.verbose_name))
return HttpResponseRedirect("../add/") return HttpResponseRedirect("../add/")
else: else:
request.user.message_set.add(message=msg) request.user.message_set.create(message=msg)
return HttpResponseRedirect("../") return HttpResponseRedirect("../")
else: else:
# Populate new_data with a "flattened" version of the current data. # Populate new_data with a "flattened" version of the current data.
@ -493,7 +493,7 @@ def delete_stage(request, app_label, model_name, object_id):
obj_display = str(obj) obj_display = str(obj)
obj.delete() obj.delete()
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.create(message=_('The %(name)s "%(obj)s" was deleted successfully.') % {'name': opts.verbose_name, 'obj': obj_display})
return HttpResponseRedirect("../../") return HttpResponseRedirect("../../")
extra_context = { extra_context = {
"title": _("Are you sure?"), "title": _("Are you sure?"),
@ -504,7 +504,7 @@ def delete_stage(request, app_label, model_name, object_id):
} }
return render_to_response(["admin/%s/%s/delete_confirmation" % (app_label, opts.object_name.lower() ), return render_to_response(["admin/%s/%s/delete_confirmation" % (app_label, opts.object_name.lower() ),
"admin/%s/delete_confirmation" % app_label , "admin/%s/delete_confirmation" % app_label ,
"admin/delete_confirmation"], extra_context, context_instance=Context(request)) "admin/delete_confirmation"], extra_context, context_instance=template.RequestContext(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):
@ -522,9 +522,9 @@ def history(request, app_label, model_name, object_id):
'module_name': capfirst(model._meta.verbose_name_plural), 'module_name': capfirst(model._meta.verbose_name_plural),
'object': obj, 'object': obj,
} }
return render_to_response(["admin/%s/%s/object_history" % (app_label, opts.object_name.lower() ), return render_to_response(["admin/%s/%s/object_history" % (app_label, model._meta.object_name.lower()),
"admin/%s/object_history" % app_label , "admin/%s/object_history" % app_label ,
"admin/object_history"], extra_context, context_instance=Context(request)) "admin/object_history"], extra_context, context_instance=template.RequestContext(request))
history = staff_member_required(history) history = staff_member_required(history)
class ChangeList(object): class ChangeList(object):