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

Closes: #14570 - Remove extra query for job under scripts and reports detailed view

Browse Source
This commit is contained in:
Daniel Sheppard 2024-01-31 10:26:51 -06:00
parent 1b9e6bed55
commit 504d58c217
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/extras/views.py
View File

@ -1059,10 +1059,6 @@ class ReportView(ContentTypePermissionRequiredMixin, View):
report = module.reports[name]() report = module.reports[name]()
jobs = module.get_jobs(report.class_name) jobs = module.get_jobs(report.class_name)
report.result = jobs.filter(
status__in=JobStatusChoices.TERMINAL_STATE_CHOICES
).first()
return render(request, 'extras/report.html', { return render(request, 'extras/report.html', {
'job_count': jobs.count(), 'job_count': jobs.count(),
'module': module, 'module': module,
@ -1233,11 +1229,6 @@ class ScriptView(ContentTypePermissionRequiredMixin, View):
jobs = module.get_jobs(script.class_name) jobs = module.get_jobs(script.class_name)
form = script.as_form(initial=normalize_querydict(request.GET)) form = script.as_form(initial=normalize_querydict(request.GET))
# Look for a pending Job (use the latest one by creation timestamp)
script.result = module.get_jobs(script.class_name).exclude(
status__in=JobStatusChoices.TERMINAL_STATE_CHOICES
).first()
return render(request, 'extras/script.html', { return render(request, 'extras/script.html', {
'job_count': jobs.count(), 'job_count': jobs.count(),
'module': module, 'module': module,