Mascali
/
netbox
mirror of https://github.com/netbox-community/netbox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

15838 use naturalday for date not naturaltime

This commit is contained in:
Arthur 2024-04-26 10:13:08 -07:00 committed by Jeremy Stretch
parent 5af3c659a5
commit 835012f2ed
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ import re
import yaml import yaml
from django import template from django import template
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.contrib.humanize.templatetags.humanize import naturaltime from django.contrib.humanize.templatetags.humanize import naturalday, naturaltime
from django.utils.html import escape from django.utils.html import escape
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from markdown import markdown from markdown import markdown
@ -216,11 +216,12 @@ def render_yaml(value):
def isodate(value): def isodate(value):
if type(value) is datetime.date: if type(value) is datetime.date:
text = value.isoformat() text = value.isoformat()
return mark_safe(f'<span title="{naturalday(value)}">{text}</span>')
elif type(value) is datetime.datetime: elif type(value) is datetime.datetime:
text = value.date().isoformat() text = value.date().isoformat()
return mark_safe(f'<span title="{naturaltime(value)}">{text}</span>')
else: else:
return '' return ''
return mark_safe(f'<span title="{naturaltime(value)}">{text}</span>')
@register.filter() @register.filter()