From 592ad18317a1a8efd4833f8659aaa646324af753 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 6 Jul 2020 13:30:13 -0400
Subject: [PATCH] Provide a default view for Report instances

---
 netbox/extras/reports.py                   | 11 +++++--
 netbox/templates/extras/report.html        | 38 ++++++++++++++++++++++
 netbox/templates/extras/report_list.html   | 22 ++++++++-----
 netbox/templates/extras/report_result.html |  2 +-
 4 files changed, 61 insertions(+), 12 deletions(-)
 create mode 100644 netbox/templates/extras/report.html

diff --git a/netbox/extras/reports.py b/netbox/extras/reports.py
index 45496d396..439868dfd 100644
--- a/netbox/extras/reports.py
+++ b/netbox/extras/reports.py
@@ -146,12 +146,19 @@ class Report(object):
         return self.__module__
 
     @property
-    def name(self):
+    def class_name(self):
         return self.__class__.__name__
 
+    @property
+    def name(self):
+        """
+        Override this attribute to set a custom display name.
+        """
+        return self.class_name
+
     @property
     def full_name(self):
-        return '.'.join([self.__module__, self.__class__.__name__])
+        return f'{self.module}.{self.class_name}'
 
     def _log(self, obj, message, level=LogLevelChoices.LOG_DEFAULT):
         """
diff --git a/netbox/templates/extras/report.html b/netbox/templates/extras/report.html
new file mode 100644
index 000000000..58bee4059
--- /dev/null
+++ b/netbox/templates/extras/report.html
@@ -0,0 +1,38 @@
+{% extends 'base.html' %}
+{% load helpers %}
+
+{% block title %}{{ report.name }}{% endblock %}
+
+{% block content %}
+    <div class="row noprint">
+        <div class="col-md-12">
+            <ol class="breadcrumb">
+                <li><a href="{% url 'extras:report_list' %}">Reports</a></li>
+                <li><a href="{% url 'extras:report_list' %}#module.{{ report.module }}">{{ report.module|bettertitle }}</a></li>
+                <li>{{ report.name }}</li>
+            </ol>
+        </div>
+    </div>
+    {% if perms.extras.run_report %}
+        <div class="pull-right noprint">
+            <form action="{% url 'extras:report' module=report.module name=report.class_name %}" method="post">
+                {% csrf_token %}
+                {{ run_form }}
+                <button type="submit" name="_run" class="btn btn-primary"><i class="fa fa-play"></i> Run Report</button>
+            </form>
+        </div>
+    {% endif %}
+    <h1>{{ report.name }}</h1>
+    <div class="row">
+        <div class="col-md-12">
+            {% if report.description %}
+                <p class="lead">{{ report.description }}</p>
+            {% endif %}
+            {% if report.result %}
+                <p>Last run: <a href="{% url 'extras:report_result' job_result_pk=report.result.pk %}">
+                    <strong>{{ report.result.created }}</strong>
+                </a></p>
+            {% endif %}
+        </div>
+    </div>
+{% endblock %}
diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html
index f507cf2b1..7918366d9 100644
--- a/netbox/templates/extras/report_list.html
+++ b/netbox/templates/extras/report_list.html
@@ -6,7 +6,7 @@
     <div class="row">
         <div class="col-md-9">
             {% if reports %}
-            {% for module, module_reports in reports %}
+                {% for module, module_reports in reports %}
                     <h3><a name="module.{{ module }}"></a>{{ module|bettertitle }}</h3>
                     <table class="table table-hover table-headings reports">
                         <thead>
@@ -21,17 +21,21 @@
                             {% for report in module_reports %}
                                 <tr>
                                     <td>
-                                        <a href="{% url 'extras:report_result' job_result_pk=report.result.pk %}" name="report.{{ report.name }}"><strong>{{ report.name }}</strong></a>
+                                        <a href="{% url 'extras:report' module=report.module name=report.class_name %}" id="{{ report.module }}.{{ report.class_name }}">
+                                            <strong>{{ report.name }}</strong>
+                                        </a>
                                     </td>
                                     <td>
                                         {% include 'extras/inc/job_label.html' with result=report.result %}
                                     </td>
-                                    <td>{{ report.description|default:"" }}</td>
-                                    {% if report.result %}
-                                        <td class="text-right">{{ report.result.created }}</td>
-                                    {% else %}
-                                        <td class="text-right text-muted">Never</td>
-                                    {% endif %}
+                                    <td>{{ report.description|placeholder }}</td>
+                                    <td class="text-right">
+                                        {% if report.result %}
+                                            <a href="{% url 'extras:report_result' job_result_pk=report.result.pk %}">{{ report.result.created }}</a>
+                                        {% else %}
+                                            <span class="text-muted">Never</span>
+                                        {% endif %}
+                                    </td>
                                 </tr>
                                 {% for method, stats in report.result.data.items %}
                                     <tr>
@@ -66,7 +70,7 @@
                         </div>
                         <ul class="list-group">
                             {% for report in module_reports %}
-                                <a href="#report.{{ report.name }}" class="list-group-item">
+                                <a href="#{{ report.module }}.{{ report.class_name }}" class="list-group-item">
                                     <i class="fa fa-list-alt"></i> {{ report.name }}
                                     <div class="pull-right">
                                         {% include 'extras/inc/job_label.html' with result=report.result %}
diff --git a/netbox/templates/extras/report_result.html b/netbox/templates/extras/report_result.html
index 2433c381d..784e79aa3 100644
--- a/netbox/templates/extras/report_result.html
+++ b/netbox/templates/extras/report_result.html
@@ -14,7 +14,7 @@
             </ol>
         </div>
     </div>
-    {% if perms.extras.add_reportresult %}
+    {% if perms.extras.run_report %}
         <div class="pull-right noprint">
             <form action="{% url 'extras:report' module=report.module name=report.name %}" method="post">
                 {% csrf_token %}