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

11077 use formatting for custom field date

Browse Source
This commit is contained in:
Arthur 2022-12-08 16:22:23 -08:00
parent ab9c253310
commit 865ac9620d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/netbox/tables/columns.py
View File

@ -7,6 +7,7 @@ from django.contrib.auth.models import AnonymousUser
from django.db.models import DateField, DateTimeField from django.db.models import DateField, DateTimeField
from django.template import Context, Template from django.template import Context, Template
from django.urls import reverse from django.urls import reverse
from django.utils.dateparse import parse_date
from django.utils.encoding import escape_uri_path from django.utils.encoding import escape_uri_path
from django.utils.html import escape from django.utils.html import escape
from django.utils.formats import date_format from django.utils.formats import date_format
@ -51,7 +52,9 @@ class DateColumn(tables.DateColumn):
default, making this behavior consistent in all fields of type DateField. default, making this behavior consistent in all fields of type DateField.
""" """
def value(self, value): def value(self, value):
return value if value:
return date_format(value, format="SHORT_DATE_FORMAT")
return None
@classmethod @classmethod
def from_field(cls, field, **kwargs): def from_field(cls, field, **kwargs):
@ -441,6 +444,7 @@ class CustomFieldColumn(tables.Column):
return escape(item) return escape(item)
def render(self, value): def render(self, value):
print("render CustomFieldColumn")
if self.customfield.type == CustomFieldTypeChoices.TYPE_BOOLEAN and value is True: if self.customfield.type == CustomFieldTypeChoices.TYPE_BOOLEAN and value is True:
return mark_safe('<i class="mdi mdi-check-bold text-success"></i>') return mark_safe('<i class="mdi mdi-check-bold text-success"></i>')
if self.customfield.type == CustomFieldTypeChoices.TYPE_BOOLEAN and value is False: if self.customfield.type == CustomFieldTypeChoices.TYPE_BOOLEAN and value is False:
@ -455,6 +459,8 @@ class CustomFieldColumn(tables.Column):
)) ))
if self.customfield.type == CustomFieldTypeChoices.TYPE_LONGTEXT and value: if self.customfield.type == CustomFieldTypeChoices.TYPE_LONGTEXT and value:
return render_markdown(value) return render_markdown(value)
if self.customfield.type == CustomFieldTypeChoices.TYPE_DATE and value:
return date_format(parse_date(value), format="SHORT_DATE_FORMAT")
if value is not None: if value is not None:
obj = self.customfield.deserialize(value) obj = self.customfield.deserialize(value)
return mark_safe(self._linkify_item(obj)) return mark_safe(self._linkify_item(obj))