Commit b7ed25a0 authored by Honza Král's avatar Honza Král
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
parent 2c3b710d

django/contrib/admin/options.py

+3 −3
Original line number Diff line number Diff line
@@ -453,9 +453,8 @@ class ModelAdmin(BaseModelAdmin): 


    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 @@ class ModelAdmin(BaseModelAdmin): 
        ], 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