diff --git a/netbox/core/tables/tasks.py b/netbox/core/tables/tasks.py index f84f23c48..ce1c4c6f5 100644 --- a/netbox/core/tables/tasks.py +++ b/netbox/core/tables/tasks.py @@ -5,6 +5,7 @@ from django.utils.html import mark_safe from django.utils.translation import gettext_lazy as _ from netbox.tables import NetBoxTable, columns +from utilities.templatetags.helpers import annotated_date from ..models import Job @@ -49,6 +50,15 @@ class BackgroundTasksQueueTable(tables.Table): args=[self.queue_index, value]) + '>' + value + '' ) + def render_created_at(self, value, record): + return annotated_date(value) + + def render_enqueued_at(self, value, record): + return annotated_date(value) + + def render_ended_at(self, value, record): + return annotated_date(value) + def render_status(self, value, record): return record.get_status diff --git a/netbox/core/views.py b/netbox/core/views.py index f2d38c984..a67325c1d 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -281,8 +281,15 @@ class BackgroundTasksJobDetailView(LoginRequiredMixin, View): except NoSuchJobError: raise Http404("Couldn't find job with this ID: %s" % job_id) + try: + job.func_name + data_is_valid = True + except Exception: + data_is_valid = False + return render(request, 'core/background_tasks_job.html', { 'queue': queue, 'job': job, 'queue_index': queue_index, + 'data_is_valid': data_is_valid, }) diff --git a/netbox/templates/core/background_tasks_job.html b/netbox/templates/core/background_tasks_job.html index cc2e05851..1b74599df 100644 --- a/netbox/templates/core/background_tasks_job.html +++ b/netbox/templates/core/background_tasks_job.html @@ -77,7 +77,7 @@ {% trans "Args" %} - {{ job.args|placeholder }} + {{ jobs.args|placeholder }} {% trans "Kwargs" %}