diff --git a/netbox/extras/tables/tables.py b/netbox/extras/tables/tables.py index 048f5cdd3..a9d80783c 100644 --- a/netbox/extras/tables/tables.py +++ b/netbox/extras/tables/tables.py @@ -531,9 +531,6 @@ class ScriptResultsTable(BaseTable): fields = ( 'index', 'time', 'status', 'message', ) - default_columns = ( - 'index', 'time', 'status', 'message', - ) class ReportResultsTable(BaseTable): @@ -559,7 +556,7 @@ class ReportResultsTable(BaseTable): verbose_name=_('Object') ) url = tables.Column( - verbose_name=_('Url') + verbose_name=_('URL') ) message = tables.Column( verbose_name=_('Message') @@ -570,6 +567,3 @@ class ReportResultsTable(BaseTable): fields = ( 'index', 'method', 'time', 'status', 'object', 'url', 'message', ) - default_columns = ( - 'index', 'method', 'time', 'status', 'object', 'url', 'message', - ) diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 25bac5f1d..a0370544f 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -1165,15 +1165,16 @@ class ScriptResultView(TableMixin, generic.ObjectView): index += 1 result = { 'index': index, - 'time': log.get('time', None), - 'status': log.get('status', None), - 'message': log.get('message', None), + 'time': log.get('time'), + 'status': log.get('status'), + 'message': log.get('message'), } data.append(result) table = ScriptResultsTable(data, user=request.user) table.configure(request) else: + # for legacy reports tests = job.data if tests: @@ -1198,8 +1199,8 @@ class ScriptResultView(TableMixin, generic.ObjectView): return table def get(self, request, **kwargs): + table = None job = get_object_or_404(Job.objects.all(), pk=kwargs.get('job_pk')) - table_logs = table_tests = None if job.completed: table = self.get_table(job, request, bulk_actions=False)