Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #14017 -- wrong comment on log_deletion method of ModelAdmin

Also added a transaction around the deletion view to preserve DB state (and rollback the creation of LogEntry object in case the deletion fails)

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit b7ed25a0f3c02b2326a6256243f66acaf4986530 1 parent 2c3b710
@HonzaKral HonzaKral authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 django/contrib/admin/options.py
View
6 django/contrib/admin/options.py
@@ -453,9 +453,8 @@ def log_change(self, request, object, message):
def log_deletion(self, request, object, object_repr):
"""
- Log that an object has been successfully deleted. Note that since the
- object is deleted, it might no longer be safe to call *any* methods
- on the object, hence this method getting object_repr.
+ Log that an object will be deleted. Note that this method is called
+ before the deletion.
The default implementation creates an admin LogEntry object.
"""
@@ -1097,6 +1096,7 @@ def changelist_view(self, request, extra_context=None):
], context, context_instance=context_instance)
@csrf_protect_m
+ @transaction.commit_on_success
def delete_view(self, request, object_id, extra_context=None):
"The 'delete' admin view for this model."
opts = self.model._meta
Please sign in to comment.
Something went wrong with that request. Please try again.