From 3b7ff2de2f982b91c29d78f78a53bfb9cf5e4043 Mon Sep 17 00:00:00 2001 From: Ebrahimi Date: Wed, 28 Dec 2022 15:05:53 +0330 Subject: [PATCH 1/2] Fix localtime bug --- auditlog/mixins.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/auditlog/mixins.py b/auditlog/mixins.py index e7b6155b..c0626257 100644 --- a/auditlog/mixins.py +++ b/auditlog/mixins.py @@ -7,7 +7,7 @@ from django.urls.exceptions import NoReverseMatch from django.utils.html import format_html, format_html_join from django.utils.safestring import mark_safe -from django.utils.timezone import localtime +from django.utils.timezone import localtime, is_aware from django.utils.translation import gettext_lazy as _ from auditlog.models import LogEntry @@ -23,7 +23,9 @@ class LogEntryAdminMixin: @admin.display(description=_("Created")) def created(self, obj): - return localtime(obj.timestamp) + if is_aware(obj.timestamp): + return localtime(obj.timestamp) + return obj.timestamp @admin.display(description=_("User")) def user_url(self, obj): From d97752f51744073eaaf9b2dd6a9adba9167d0014 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 28 Dec 2022 11:39:34 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- auditlog/mixins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auditlog/mixins.py b/auditlog/mixins.py index c0626257..11ee77c6 100644 --- a/auditlog/mixins.py +++ b/auditlog/mixins.py @@ -7,7 +7,7 @@ from django.urls.exceptions import NoReverseMatch from django.utils.html import format_html, format_html_join from django.utils.safestring import mark_safe -from django.utils.timezone import localtime, is_aware +from django.utils.timezone import is_aware, localtime from django.utils.translation import gettext_lazy as _ from auditlog.models import LogEntry