NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-17 04:58:16 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

10587 review changes

Browse Source
This commit is contained in:
Arthur 2024-03-07 08:01:47 -08:00
parent 44fa0cba18
commit 954c406b0e
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -531,9 +531,6 @@ class ScriptResultsTable(BaseTable):
fields = ( fields = (
'index', 'time', 'status', 'message', 'index', 'time', 'status', 'message',
) )
default_columns = (
'index', 'time', 'status', 'message',
)
class ReportResultsTable(BaseTable): class ReportResultsTable(BaseTable):
@ -559,7 +556,7 @@ class ReportResultsTable(BaseTable):
verbose_name=_('Object') verbose_name=_('Object')
) )
url = tables.Column( url = tables.Column(
verbose_name=_('Url') verbose_name=_('URL')
) )
message = tables.Column( message = tables.Column(
verbose_name=_('Message') verbose_name=_('Message')
@ -570,6 +567,3 @@ class ReportResultsTable(BaseTable):
fields = ( fields = (
'index', 'method', 'time', 'status', 'object', 'url', 'message', 'index', 'method', 'time', 'status', 'object', 'url', 'message',
) )
default_columns = (
'index', 'method', 'time', 'status', 'object', 'url', 'message',
)

9
netbox/extras/views.py
View File

@ -1165,15 +1165,16 @@ class ScriptResultView(TableMixin, generic.ObjectView):
index += 1 index += 1
result = { result = {
'index': index, 'index': index,
'time': log.get('time', None), 'time': log.get('time'),
'status': log.get('status', None), 'status': log.get('status'),
'message': log.get('message', None), 'message': log.get('message'),
} }
data.append(result) data.append(result)
table = ScriptResultsTable(data, user=request.user) table = ScriptResultsTable(data, user=request.user)
table.configure(request) table.configure(request)
else: else:
# for legacy reports
tests = job.data tests = job.data
if tests: if tests:
@ -1198,8 +1199,8 @@ class ScriptResultView(TableMixin, generic.ObjectView):
return table return table
def get(self, request, **kwargs): def get(self, request, **kwargs):
table = None
job = get_object_or_404(Job.objects.all(), pk=kwargs.get('job_pk')) job = get_object_or_404(Job.objects.all(), pk=kwargs.get('job_pk'))
table_logs = table_tests = None
if job.completed: if job.completed:
table = self.get_table(job, request, bulk_actions=False) table = self.get_table(job, request, bulk_actions=False)