diff options
| author | antoliny0919 <antoliny0919@gmail.com> | 2025-02-28 12:17:17 +0100 |
|---|---|---|
| committer | Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> | 2025-03-04 10:38:15 +0100 |
| commit | 03ace756eafc3f7a85f5b84d28ce1e7ce092c018 (patch) | |
| tree | cc1be8d05c7fbb47164a46bdb6239ab37e016ac2 /django | |
| parent | 76a9f12b6098632b1b326e40fb6eb65500c214e1 (diff) | |
[5.1.x] Fixed #36217 -- Restored pre_save/post_save signal emission via LogEntry.save() for single-object deletion in the admin.
Regression in 40b3975e7d3e1464a733c69171ad7d38f8814280.
Thanks smiling-watermelon for the report.
Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>
Backport of c09bceef68e5abb79accedd12dade16aa6577a09 from main.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/models.py | 6 | ||||
| -rw-r--r-- | django/contrib/admin/options.py | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/django/contrib/admin/models.py b/django/contrib/admin/models.py index bb81be8297..345b8cf341 100644 --- a/django/contrib/admin/models.py +++ b/django/contrib/admin/models.py @@ -51,9 +51,7 @@ class LogEntryManager(models.Manager): change_message=change_message, ) - def log_actions( - self, user_id, queryset, action_flag, change_message="", *, single_object=False - ): + def log_actions(self, user_id, queryset, action_flag, change_message=""): # RemovedInDjango60Warning. if type(self).log_action != LogEntryManager.log_action: warnings.warn( @@ -93,7 +91,7 @@ class LogEntryManager(models.Manager): for obj in queryset ] - if single_object and log_entry_list: + if len(log_entry_list) == 1: instance = log_entry_list[0] instance.save() return instance diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 5401bcabbe..4df5018804 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -954,7 +954,6 @@ class ModelAdmin(BaseModelAdmin): queryset=[obj], action_flag=ADDITION, change_message=message, - single_object=True, ) def log_change(self, request, obj, message): @@ -970,7 +969,6 @@ class ModelAdmin(BaseModelAdmin): queryset=[obj], action_flag=CHANGE, change_message=message, - single_object=True, ) def log_deletion(self, request, obj, object_repr): |