Fixes #13666: Fix behavior for reports without test methods (#13667)

netbox-community · Sep 26, 2023 · e67624f · e67624f
1 parent 27297c7
commit e67624f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/netbox/extras/reports.py b/netbox/extras/reports.py
@@ -106,8 +106,6 @@ def __init__(self):
                     'failure': 0,
                     'log': [],
                 }
-        if not test_methods:
-            raise Exception("A report must contain at least one test method.")
         self.test_methods = test_methods
 
     @classproperty

diff --git a/netbox/templates/extras/report.html b/netbox/templates/extras/report.html
@@ -12,7 +12,11 @@
             {% csrf_token %}
             {% render_form form %}
             <div class="float-end">
-              <button type="submit" name="_run" class="btn btn-primary">
+              <button type="submit" name="_run" class="btn btn-primary"
+              {% if not report.test_methods|length %}
+                disabled
+              {% endif %}
+              >
                 {% if report.result %}
                   <i class="mdi mdi-replay"></i> {% trans "Run Again" %}
                 {% else %}

diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html
@@ -68,10 +68,16 @@ <h5 class="card-header" id="module{{ module.pk }}">
                           </td>
                         {% else %}
                           <td class="text-muted">{% trans "Never" %}</td>
-                          <td>{{ ''|placeholder }}</td>
+                          {% if report.test_methods|length %}
+                            <td>{{ ''|placeholder }}</td>
+                          {% else %}
+                            <td>
+                              Invalid (no test methods found)
+                           </td>
+                          {% endif %}
                         {% endif %}
                         <td>
-                          {% if perms.extras.run_report %}
+                          {% if perms.extras.run_report and report.test_methods|length %}
                             <div class="float-end noprint">
                               <form action="{% url 'extras:report' module=report.module name=report.class_name %}" method="post">
                                 {% csrf_token %}