Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix localtime bug #487

Closed
wants to merge 2 commits into from
Closed

Fix localtime bug #487

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b7ff2d
Fix localtime bug
ZahraEbrahimi01 Dec 28, 2022
d97752f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions auditlog/mixins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 is_aware, localtime
from django.utils.translation import gettext_lazy as _

from auditlog.models import LogEntry
Expand All @@ -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):
Expand Down