From 1b29d3289473a6c3ce565c0ddc1bed4d5b5ac9a3 Mon Sep 17 00:00:00 2001 From: Alasdair Nicol Date: Sun, 9 Feb 2014 12:29:29 +0000 Subject: [PATCH] Fixed #21771 -- Made log_deletion consistent with other log methods. Thanks Keryn Knight for the report. --- django/contrib/admin/options.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 5e883e5a8a..e3c3e8e57e 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -758,15 +758,15 @@ class ModelAdmin(BaseModelAdmin): def log_deletion(self, request, object, object_repr): """ - Log that an object will be deleted. Note that this method is called - before the deletion. + Log that an object will be deleted. Note that this method must be + called before the deletion. The default implementation creates an admin LogEntry object. """ from django.contrib.admin.models import LogEntry, DELETION LogEntry.objects.log_action( user_id=request.user.pk, - content_type_id=get_content_type_for_model(self.model).pk, + content_type_id=get_content_type_for_model(object).pk, object_id=object.pk, object_repr=object_repr, action_flag=DELETION