NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-14 01:41:22 -06:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fixes #13925: Support 'zulu' style timestamps for custom fields

Browse Source
This commit is contained in:
Jeremy Stretch 2024-06-14 10:38:09 -04:00
parent a597ad849e
commit b2360b62b5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/extras/models/customfields.py
View File

@ -660,6 +660,10 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
# Validate date & time # Validate date & time
elif self.type == CustomFieldTypeChoices.TYPE_DATETIME: elif self.type == CustomFieldTypeChoices.TYPE_DATETIME:
if type(value) is not datetime: if type(value) is not datetime:
# Work around UTC issue for Python < 3.11; see
# https://docs.python.org/3/library/datetime.html#datetime.datetime.fromisoformat
if type(value) is str and value.endswith('Z'):
value = f'{value[:-1]}+00:00'
try: try:
datetime.fromisoformat(value) datetime.fromisoformat(value)
except ValueError: except ValueError:

2
netbox/utilities/templates/builtins/customfield_value.html
View File

@ -11,7 +11,7 @@
{% elif customfield.type == 'date' and value %} {% elif customfield.type == 'date' and value %}
{{ value|isodate }} {{ value|isodate }}
{% elif customfield.type == 'datetime' and value %} {% elif customfield.type == 'datetime' and value %}
{{ value|isodate }} {{ value|isodatetime }} {{ value|isodatetime }}
{% elif customfield.type == 'url' and value %} {% elif customfield.type == 'url' and value %}
<a href="{{ value }}">{{ value|truncatechars:70 }}</a> <a href="{{ value }}">{{ value|truncatechars:70 }}</a>
{% elif customfield.type == 'json' and value %} {% elif customfield.type == 'json' and value %}