NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-08 00:28:16 -06:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Handle naive datetimes gracefully

Browse Source
This commit is contained in:
Brian Tiemann 2024-08-26 11:27:29 -04:00
parent 07ad4c1c9c
commit 409564091d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/utilities/templatetags/builtins/filters.py
View File

@ -219,7 +219,8 @@ def isodate(value):
text = value.isoformat() text = value.isoformat()
return mark_safe(f'<span title="{naturalday(value)}">{text}</span>') return mark_safe(f'<span title="{naturalday(value)}">{text}</span>')
elif type(value) is datetime.datetime: elif type(value) is datetime.datetime:
text = localtime(value).date().isoformat() local_value = localtime(value) if value.tzinfo else value
text = local_value.date().isoformat()
return mark_safe(f'<span title="{naturaltime(value)}">{text}</span>') return mark_safe(f'<span title="{naturaltime(value)}">{text}</span>')
else: else:
return '' return ''
@ -230,7 +231,8 @@ def isotime(value, spec='seconds'):
if type(value) is datetime.time: if type(value) is datetime.time:
return value.isoformat(timespec=spec) return value.isoformat(timespec=spec)
if type(value) is datetime.datetime: if type(value) is datetime.datetime:
return localtime(value).time().isoformat(timespec=spec) local_value = localtime(value) if value.tzinfo else value
return local_value.time().isoformat(timespec=spec)
return '' return ''