Ticket #1416: admin.diff
File admin.diff, 3.9 KB (added by , 19 years ago) |
---|
-
django/contrib/admin/views/main.py
249 249 # Here, we distinguish between different save types by checking for 250 250 # the presence of keys in request.POST. 251 251 if request.POST.has_key("_continue"): 252 request.user.message_set. add(message=msg + ' ' + _("You may edit it again below."))252 request.user.message_set.create(message=msg + ' ' + _("You may edit it again below.")) 253 253 if request.POST.has_key("_popup"): 254 254 post_url_continue += "?_popup=1" 255 255 return HttpResponseRedirect(post_url_continue % pk_value) … … 257 257 return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, %s, "%s");</script>' % \ 258 258 (pk_value, str(new_object).replace('"', '\\"'))) 259 259 elif request.POST.has_key("_addanother"): 260 request.user.message_set. add(message=msg + ' ' + (_("You may add another %s below.") % opts.verbose_name))260 request.user.message_set.create(message=msg + ' ' + (_("You may add another %s below.") % opts.verbose_name)) 261 261 return HttpResponseRedirect(request.path) 262 262 else: 263 request.user.message_set. add(message=msg)263 request.user.message_set.create(message=msg) 264 264 return HttpResponseRedirect(post_url) 265 265 else: 266 266 # Add default data. … … 333 333 334 334 msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': opts.verbose_name, 'obj': new_object} 335 335 if request.POST.has_key("_continue"): 336 request.user.message_set. add(message=msg + ' ' + _("You may edit it again below."))336 request.user.message_set.create(message=msg + ' ' + _("You may edit it again below.")) 337 337 if request.REQUEST.has_key('_popup'): 338 338 return HttpResponseRedirect(request.path + "?_popup=1") 339 339 else: 340 340 return HttpResponseRedirect(request.path) 341 341 elif request.POST.has_key("_saveasnew"): 342 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})342 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}) 343 343 return HttpResponseRedirect("../%s/" % pk_value) 344 344 elif request.POST.has_key("_addanother"): 345 request.user.message_set. add(message=msg + ' ' + (_("You may add another %s below.") % opts.verbose_name))345 request.user.message_set.create(message=msg + ' ' + (_("You may add another %s below.") % opts.verbose_name)) 346 346 return HttpResponseRedirect("../add/") 347 347 else: 348 request.user.message_set. add(message=msg)348 request.user.message_set.create(message=msg) 349 349 return HttpResponseRedirect("../") 350 350 else: 351 351 # Populate new_data with a "flattened" version of the current data. … … 493 493 obj_display = str(obj) 494 494 obj.delete() 495 495 LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(model).id, object_id, obj_display, DELETION) 496 request.user.message_set. add(message=_('The %(name)s "%(obj)s" was deleted successfully.') % {'name': opts.verbose_name, 'obj': obj_display})496 request.user.message_set.create(message=_('The %(name)s "%(obj)s" was deleted successfully.') % {'name': opts.verbose_name, 'obj': obj_display}) 497 497 return HttpResponseRedirect("../../") 498 498 extra_context = { 499 499 "title": _("Are you sure?"),