Просмотр исходного кода

format script results timestamp (#20307)

Elliott Balsley 5 месяцев назад
Родитель
Сommit
be4db9a899
2 измененных файлов с 5 добавлено и 4 удалено
  1. 3 2
      netbox/extras/tables/tables.py
  2. 2 2
      netbox/extras/views.py

+ 3 - 2
netbox/extras/tables/tables.py

@@ -725,8 +725,9 @@ class ScriptResultsTable(BaseTable):
     index = tables.Column(
     index = tables.Column(
         verbose_name=_('Line')
         verbose_name=_('Line')
     )
     )
-    time = tables.Column(
-        verbose_name=_('Time')
+    time = columns.DateTimeColumn(
+        verbose_name=_('Time'),
+        timespec='seconds'
     )
     )
     status = tables.TemplateColumn(
     status = tables.TemplateColumn(
         template_code="""{% load log_levels %}{% log_level record.status %}""",
         template_code="""{% load log_levels %}{% log_level record.status %}""",

+ 2 - 2
netbox/extras/views.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 from django.contrib import messages
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.models import ContentType
@@ -1547,7 +1548,6 @@ class ScriptResultView(TableMixin, generic.ObjectView):
         except KeyError:
         except KeyError:
             log_threshold = LOG_LEVEL_RANK[LogLevelChoices.LOG_INFO]
             log_threshold = LOG_LEVEL_RANK[LogLevelChoices.LOG_INFO]
         if job.data:
         if job.data:
-
             if 'log' in job.data:
             if 'log' in job.data:
                 if 'tests' in job.data:
                 if 'tests' in job.data:
                     tests = job.data['tests']
                     tests = job.data['tests']
@@ -1558,7 +1558,7 @@ class ScriptResultView(TableMixin, generic.ObjectView):
                         index += 1
                         index += 1
                         result = {
                         result = {
                             'index': index,
                             'index': index,
-                            'time': log.get('time'),
+                            'time': datetime.fromisoformat(log.get('time')),
                             'status': log.get('status'),
                             'status': log.get('status'),
                             'message': log.get('message'),
                             'message': log.get('message'),
                             'object': log.get('obj'),
                             'object': log.get('obj'),