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

Adjust report views to resolve same problem

Browse Source
This commit is contained in:
Daniel Sheppard 2024-01-09 12:04:33 -06:00
parent 8a140009d0
commit 5c3da7a966
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
netbox/extras/views.py
View File

@ -1007,6 +1007,22 @@ class DashboardWidgetDeleteView(LoginRequiredMixin, View):
return redirect(reverse('home'))
#
# Function for returning job data - used in scripts and reports
#
# Return jobs filtered for job model type (Example: `scriptmodule`)
def get_jobs(module, job_object, jobtype):
# Check if it is a supported module. Return an empty queryset if not
object_type = ContentType.objects.get(app_label='extras', model=jobtype)
jobs = Job.objects.filter(
object_type=object_type,
object_id=module.pk,
name=job_object.class_name,
)
return jobs
#
# Reports
#
@ -1057,16 +1073,12 @@ class ReportView(ContentTypePermissionRequiredMixin, View):
def get(self, request, module, name):
module = get_report_module(module, request)
report = module.reports[name]()
jobs = get_jobs(module, report, 'reportmodule')
object_type = ContentType.objects.get(app_label='extras', model='reportmodule')
report.result = Job.objects.filter(
object_type=object_type,
object_id=module.pk,
name=report.name,
status__in=JobStatusChoices.TERMINAL_STATE_CHOICES
).first()
report.result = jobs.first()
return render(request, 'extras/report.html', {
'jobs': jobs,
'module': module,
'report': report,
'form': ReportForm(scheduling_enabled=report.scheduling_enabled),
@ -1103,6 +1115,7 @@ class ReportView(ContentTypePermissionRequiredMixin, View):
return redirect('extras:report_result', job_pk=job.pk)
return render(request, 'extras/report.html', {
'jobs': get_jobs(module, report, 'reportmodule'),
'module': module,
'report': report,
'form': form,
@ -1119,6 +1132,7 @@ class ReportSourceView(ContentTypePermissionRequiredMixin, View):
report = module.reports[name]()
return render(request, 'extras/report/source.html', {
'jobs': get_jobs(module, report, 'reportmodule'),
'module': module,
'report': report,
'tab': 'source',
@ -1135,11 +1149,7 @@ class ReportJobsView(ContentTypePermissionRequiredMixin, View):
report = module.reports[name]()
object_type = ContentType.objects.get(app_label='extras', model='reportmodule')
jobs = Job.objects.filter(
object_type=object_type,
object_id=module.pk,
name=report.class_name
)
jobs = get_jobs(module, report, 'reportmodule')
jobs_table = JobTable(
data=jobs,
@ -1149,6 +1159,7 @@ class ReportJobsView(ContentTypePermissionRequiredMixin, View):
jobs_table.configure(request)
return render(request, 'extras/report/jobs.html', {
'jobs': jobs,
'module': module,
'report': report,
'table': jobs_table,
@ -1224,19 +1235,6 @@ def get_script_module(module, request):
return get_object_or_404(ScriptModule.objects.restrict(request.user), file_path__regex=f"^{module}\\.")
# Return jobs filtered for job model type (Example: `scriptmodule`)
def get_jobs(module, script, jobtype):
# Check if it is a supported module. Return an empty queryset if not
object_type = ContentType.objects.get(app_label='extras', model=jobtype)
jobs = Job.objects.filter(
object_type=object_type,
object_id=module.pk,
name=script.class_name,
)
return jobs
class ScriptView(ContentTypePermissionRequiredMixin, View):
def get_required_permission(self):

2
netbox/templates/extras/report/base.html
View File

@ -34,7 +34,7 @@
</li>
<li class="nav-item" role="presentation">
<a class="nav-link{% if tab == 'jobs' %} active{% endif %}" href="{% url 'extras:report_jobs' module=report.module name=report.class_name %}">
{% trans "Jobs" %} {% badge module.jobs.count %}
{% trans "Jobs" %} {% badge jobs.count %}
</a>
</li>
</ul>