From bfcbe5961082c3c4daf91b4377c1d5b0753598ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alieh=20Ryma=C5=A1e=C5=ADski?= Date: Mon, 16 Jan 2023 13:51:19 -0100 Subject: [PATCH] Revert "Disallow changing or deleting log entries" This reverts commit de5638c607e781f2915e89ee3013c83846dfdfc7. --- CHANGELOG.md | 4 ++++ auditlog/admin.py | 7 +------ auditlog_tests/tests.py | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 109bcdd4..1fc2f147 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Next Release +#### Fixes + +- fix: revert [#449](https://github.com/jazzband/django-auditlog/pull/449) "Make log entries read-only in the admin" as it breaks deletion of any auditlogged model through the admin when `AuditlogHistoryField` is used. ([#496](https://github.com/jazzband/django-auditlog/pull/496)) + ## 2.2.1 (2022-11-28) #### Fixes diff --git a/auditlog/admin.py b/auditlog/admin.py index 0ba53543..83fe9bb5 100644 --- a/auditlog/admin.py +++ b/auditlog/admin.py @@ -26,10 +26,5 @@ class LogEntryAdmin(admin.ModelAdmin, LogEntryAdminMixin): ] def has_add_permission(self, request): - return False - - def has_change_permission(self, request, obj=None): - return False - - def has_delete_permission(self, request, obj=None): + # As audit admin doesn't allow log creation from admin return False diff --git a/auditlog_tests/tests.py b/auditlog_tests/tests.py index e88c706e..edbc3134 100644 --- a/auditlog_tests/tests.py +++ b/auditlog_tests/tests.py @@ -1297,7 +1297,7 @@ def test_auditlog_admin(self): res = self.client.get(f"/admin/auditlog/logentry/{log_pk}/", follow=True) self.assertEqual(res.status_code, 200) res = self.client.get(f"/admin/auditlog/logentry/{log_pk}/delete/") - self.assertEqual(res.status_code, 403) + self.assertEqual(res.status_code, 200) res = self.client.get(f"/admin/auditlog/logentry/{log_pk}/history/") self.assertEqual(res.status_code, 200)