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

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
This commit is contained in:
Honza Král 2010-10-13 04:16:31 +00:00
parent 2c3b710d0a
commit b7ed25a0f3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/admin/options.py
View File

@ -453,9 +453,8 @@ class ModelAdmin(BaseModelAdmin):
def log_deletion(self, request, object, object_repr): def log_deletion(self, request, object, object_repr):
""" """
Log that an object has been successfully deleted. Note that since the Log that an object will be deleted. Note that this method is called
object is deleted, it might no longer be safe to call *any* methods before the deletion.
on the object, hence this method getting object_repr.
The default implementation creates an admin LogEntry object. The default implementation creates an admin LogEntry object.
""" """
@ -1097,6 +1096,7 @@ class ModelAdmin(BaseModelAdmin):
], context, context_instance=context_instance) ], context, context_instance=context_instance)
@csrf_protect_m @csrf_protect_m
@transaction.commit_on_success
def delete_view(self, request, object_id, extra_context=None): def delete_view(self, request, object_id, extra_context=None):
"The 'delete' admin view for this model." "The 'delete' admin view for this model."
opts = self.model._meta opts = self.model._meta