From 39bd421d9bf81bfd3814d0f23d2f9347093dbeb1 Mon Sep 17 00:00:00 2001 From: Nathan Bureau Date: Thu, 4 Apr 2024 17:19:06 +0100 Subject: [PATCH 1/3] Fix serialize __proxy__ objects before logging --- CHANGELOG.md | 1 + auditlog/diff.py | 2 ++ auditlog_tests/models.py | 2 +- auditlog_tests/tests.py | 13 +++++++++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4815afce..84f112f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changes ## Next Release +- Fixed logging problem related to django translation before logging ([#624](https://github.com/jazzband/django-auditlog/pull/624)) ## 3.0.0-beta.4 (2024-01-02) diff --git a/auditlog/diff.py b/auditlog/diff.py index eece7254..b4294fed 100644 --- a/auditlog/diff.py +++ b/auditlog/diff.py @@ -82,6 +82,8 @@ def get_field_value(obj, field): ) else: value = smart_str(getattr(obj, field.name, None)) + if type(value).__name__ == "__proxy__": + value = str(value) except ObjectDoesNotExist: value = ( field.default diff --git a/auditlog_tests/models.py b/auditlog_tests/models.py index 1e16f933..f5db94e6 100644 --- a/auditlog_tests/models.py +++ b/auditlog_tests/models.py @@ -24,7 +24,7 @@ class SimpleModel(models.Model): history = AuditlogHistoryField(delete_related=True) def __str__(self): - return self.text + return str(self.text) class AltPrimaryKeyModel(models.Model): diff --git a/auditlog_tests/tests.py b/auditlog_tests/tests.py index 1ce319f0..86f99a17 100644 --- a/auditlog_tests/tests.py +++ b/auditlog_tests/tests.py @@ -23,6 +23,7 @@ from django.utils import dateformat, formats from django.utils import timezone as django_timezone from django.utils.encoding import smart_str +from django.utils.translation import gettext_lazy as _ from auditlog.admin import LogEntryAdmin from auditlog.cid import get_cid @@ -1641,6 +1642,18 @@ def test_changes_msg_delete(self): ), ) + def test_instance_translation_and_history_logging(self): + first = SimpleModel() + second = SimpleModel(text=_("test")) + changes = model_instance_diff(first, second) + self.assertEqual( + changes, + {'text': ('', 'test')} + ) + second.save() + log_one = second.history.last() + self.assertTrue(isinstance(log_one, LogEntry)) + def test_changes_msg_create(self): log_entry = self._create_log_entry( LogEntry.Action.CREATE, From 2dec7d373318312f0365294f9acc069b5d3e63e0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 09:02:32 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- auditlog_tests/tests.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/auditlog_tests/tests.py b/auditlog_tests/tests.py index 86f99a17..b04077e7 100644 --- a/auditlog_tests/tests.py +++ b/auditlog_tests/tests.py @@ -1646,10 +1646,7 @@ def test_instance_translation_and_history_logging(self): first = SimpleModel() second = SimpleModel(text=_("test")) changes = model_instance_diff(first, second) - self.assertEqual( - changes, - {'text': ('', 'test')} - ) + self.assertEqual(changes, {"text": ("", "test")}) second.save() log_one = second.history.last() self.assertTrue(isinstance(log_one, LogEntry)) From 546e5d3cf233cac0bca17f20fd3d1e90cde7a601 Mon Sep 17 00:00:00 2001 From: Hasan Ramezani Date: Mon, 8 Apr 2024 11:13:40 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84f112f8..d5f0a410 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changes ## Next Release +#### Fixes + - Fixed logging problem related to django translation before logging ([#624](https://github.com/jazzband/django-auditlog/pull/624)) ## 3.0.0-beta.4 (2024-01-02)