NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-22 20:12:00 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Clean up script & report job views

Browse Source
This commit is contained in:
jeremystretch 2023-04-17 15:27:12 -04:00
parent a0893c2e8b
commit 7ecf3be33c
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/extras/views.py
View File

@ -945,8 +945,7 @@ class ReportJobsView(ContentTypePermissionRequiredMixin, View):
jobs = Job.objects.filter( jobs = Job.objects.filter(
object_type=object_type, object_type=object_type,
object_id=module.pk, object_id=module.pk,
name=report.name, name=report.name
status__in=JobStatusChoices.TERMINAL_STATE_CHOICES
) )
jobs_table = JobTable( jobs_table = JobTable(
@ -1119,8 +1118,7 @@ class ScriptJobsView(ContentTypePermissionRequiredMixin, View):
jobs = Job.objects.filter( jobs = Job.objects.filter(
object_type=object_type, object_type=object_type,
object_id=module.pk, object_id=module.pk,
name=script.class_name, name=script.class_name
status__in=JobStatusChoices.TERMINAL_STATE_CHOICES
) )
jobs_table = JobTable( jobs_table = JobTable(

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

@ -32,7 +32,9 @@
<a class="nav-link{% if tab == 'source' %} active{% endif %}" href="{% url 'extras:report_source' module=report.module name=report.class_name %}">Source</a> <a class="nav-link{% if tab == 'source' %} active{% endif %}" href="{% url 'extras:report_source' module=report.module name=report.class_name %}">Source</a>
</li> </li>
<li class="nav-item" role="presentation"> <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 %}">Jobs</a> <a class="nav-link{% if tab == 'jobs' %} active{% endif %}" href="{% url 'extras:report_jobs' module=report.module name=report.class_name %}">
Jobs {% badge module.jobs.count %}
</a>
</li> </li>
</ul> </ul>
{% endblock tabs %} {% endblock tabs %}

4
netbox/templates/extras/script/base.html
View File

@ -31,7 +31,9 @@
<a class="nav-link{% if tab == 'source' %} active{% endif %}" href="{% url 'extras:script_source' module=script.module name=script.class_name %}">Source</a> <a class="nav-link{% if tab == 'source' %} active{% endif %}" href="{% url 'extras:script_source' module=script.module name=script.class_name %}">Source</a>
</li> </li>
<li class="nav-item" role="presentation"> <li class="nav-item" role="presentation">
<a class="nav-link{% if tab == 'jobs' %} active{% endif %}" href="{% url 'extras:script_jobs' module=script.module name=script.class_name %}">Jobs</a> <a class="nav-link{% if tab == 'jobs' %} active{% endif %}" href="{% url 'extras:script_jobs' module=script.module name=script.class_name %}">
Jobs {% badge module.jobs.count %}
</a>
</li> </li>
</ul> </ul>
{% endblock tabs %} {% endblock tabs %}