innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #267 -- "Save and continue editing" no longer assumes object has an ID field. Thanks, Hugo 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-08-04 14:48:48 +00:00
parent 3f2df5e7aa
commit a8ecb56106
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
django/views/admin/main.py
View File

@ -766,7 +766,8 @@ def add_stage(request, app_label, module_name, show_delete=False, form_url='', p
if not errors and not request.POST.has_key("_preview"): if not errors and not request.POST.has_key("_preview"):
manipulator.do_html2python(new_data) manipulator.do_html2python(new_data)
new_object = manipulator.save(new_data) new_object = manipulator.save(new_data)
log.log_action(request.user.id, opts.get_content_type_id(), getattr(new_object, opts.pk.name), repr(new_object), log.ADDITION) pk_value = getattr(new_object, opts.pk.name)
log.log_action(request.user.id, opts.get_content_type_id(), pk_value, repr(new_object), log.ADDITION)
msg = 'The %s "%s" was added successfully.' % (opts.verbose_name, new_object) msg = 'The %s "%s" was added successfully.' % (opts.verbose_name, new_object)
# 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.
@ -774,11 +775,10 @@ def add_stage(request, app_label, module_name, show_delete=False, form_url='', p
request.user.add_message("%s You may edit it again below." % msg) request.user.add_message("%s You may edit it again below." % msg)
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 % new_object.id) return HttpResponseRedirect(post_url_continue % pk_value)
if request.POST.has_key("_popup"): if request.POST.has_key("_popup"):
return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, %s, "%s");</script>' % \ return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, %s, "%s");</script>' % \
(getattr(new_object, opts.pk.name), repr(new_object).replace('"', '\\"')), (pk_value, repr(new_object).replace('"', '\\"')), mimetype='text/html; charset=utf-8')
mimetype='text/html; charset=utf-8')
elif request.POST.has_key("_addanother"): elif request.POST.has_key("_addanother"):
request.user.add_message("%s You may add another %s below." % (msg, opts.verbose_name)) request.user.add_message("%s You may add another %s below." % (msg, opts.verbose_name))
return HttpResponseRedirect(request.path) return HttpResponseRedirect(request.path)
@ -862,6 +862,7 @@ def change_stage(request, app_label, module_name, object_id):
if not errors and not request.POST.has_key("_preview"): if not errors and not request.POST.has_key("_preview"):
manipulator.do_html2python(new_data) manipulator.do_html2python(new_data)
new_object = manipulator.save(new_data) new_object = manipulator.save(new_data)
pk_value = getattr(new_object, opts.pk.name)
# Construct the change message. # Construct the change message.
change_message = [] change_message = []
@ -875,7 +876,7 @@ def change_stage(request, app_label, module_name, object_id):
if not change_message: if not change_message:
change_message = 'No fields changed.' change_message = 'No fields changed.'
log.log_action(request.user.id, opts.get_content_type_id(), getattr(new_object, opts.pk.name), repr(new_object), log.CHANGE, change_message) log.log_action(request.user.id, opts.get_content_type_id(), pk_value, repr(new_object), log.CHANGE, change_message)
msg = 'The %s "%s" was changed successfully.' % (opts.verbose_name, new_object) msg = 'The %s "%s" was changed successfully.' % (opts.verbose_name, new_object)
if request.POST.has_key("_continue"): if request.POST.has_key("_continue"):
request.user.add_message("%s You may edit it again below." % msg) request.user.add_message("%s You may edit it again below." % msg)
@ -885,7 +886,7 @@ def change_stage(request, app_label, module_name, object_id):
return HttpResponseRedirect(request.path) return HttpResponseRedirect(request.path)
elif request.POST.has_key("_saveasnew"): elif request.POST.has_key("_saveasnew"):
request.user.add_message('The %s "%s" was added successfully. You may edit it again below.' % (opts.verbose_name, new_object)) request.user.add_message('The %s "%s" was added successfully. You may edit it again below.' % (opts.verbose_name, new_object))
return HttpResponseRedirect("../%s/" % new_object.id) return HttpResponseRedirect("../%s/" % pk_value)
elif request.POST.has_key("_addanother"): elif request.POST.has_key("_addanother"):
request.user.add_message("%s You may add another %s below." % (msg, opts.verbose_name)) request.user.add_message("%s You may add another %s below." % (msg, opts.verbose_name))
return HttpResponseRedirect("../add/") return HttpResponseRedirect("../add/")