From 7ecf3be33c691e2887946f3c36007762bb733557 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@netboxlabs.com>
Date: Mon, 17 Apr 2023 15:27:12 -0400
Subject: [PATCH] Clean up script & report job views

---
 netbox/extras/views.py                   | 6 ++----
 netbox/templates/extras/report/base.html | 4 +++-
 netbox/templates/extras/script/base.html | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 685ee853b..a819d1287 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -945,8 +945,7 @@ class ReportJobsView(ContentTypePermissionRequiredMixin, View):
         jobs = Job.objects.filter(
             object_type=object_type,
             object_id=module.pk,
-            name=report.name,
-            status__in=JobStatusChoices.TERMINAL_STATE_CHOICES
+            name=report.name
         )
 
         jobs_table = JobTable(
@@ -1119,8 +1118,7 @@ class ScriptJobsView(ContentTypePermissionRequiredMixin, View):
         jobs = Job.objects.filter(
             object_type=object_type,
             object_id=module.pk,
-            name=script.class_name,
-            status__in=JobStatusChoices.TERMINAL_STATE_CHOICES
+            name=script.class_name
         )
 
         jobs_table = JobTable(
diff --git a/netbox/templates/extras/report/base.html b/netbox/templates/extras/report/base.html
index 8e9182bdd..3a4bb13a1 100644
--- a/netbox/templates/extras/report/base.html
+++ b/netbox/templates/extras/report/base.html
@@ -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>
     </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 %}">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>
   </ul>
 {% endblock tabs %}
diff --git a/netbox/templates/extras/script/base.html b/netbox/templates/extras/script/base.html
index b788bc270..118780319 100644
--- a/netbox/templates/extras/script/base.html
+++ b/netbox/templates/extras/script/base.html
@@ -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>
     </li>
     <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>
   </ul>
 {% endblock tabs %}