Jeremy Stretch 2 недель назад
Родитель
Сommit
93bf49b1ec
2 измененных файлов с 9 добавлено и 1 удалено
  1. 1 1
      netbox/core/ui/panels.py
  2. 8 0
      netbox/templates/core/job/attrs/elapsed_time.html

+ 1 - 1
netbox/core/ui/panels.py

@@ -62,7 +62,7 @@ class JobSchedulingPanel(panels.ObjectAttributesPanel):
     scheduled = attrs.TemplatedAttr('scheduled', template_name='core/job/attrs/scheduled.html')
     started = attrs.DateTimeAttr('started')
     completed = attrs.DateTimeAttr('completed')
-    execution_time = attrs.DurationAttr('execution_time')
+    elapsed_time = attrs.TemplatedAttr('elapsed_time', template_name='core/job/attrs/elapsed_time.html')
     queue = attrs.TextAttr('queue_name', label=_('Queue'))
 
 

+ 8 - 0
netbox/templates/core/job/attrs/elapsed_time.html

@@ -0,0 +1,8 @@
+{% load helpers %}
+{% load i18n %}
+{% if object.completed %}
+  {{ value|humanize_duration }}
+{% else %}
+  {# The job is still running, so its elapsed time is provisional #}
+  <span class="text-primary" title="{% trans "Still running" %}">{{ value|humanize_duration }}</span>
+{% endif %}