From 49f268a14caea8a2c47a4787053936be5569c631 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 30 Jan 2018 21:01:08 -0500 Subject: [PATCH] Added report results to the home page --- netbox/netbox/views.py | 3 ++- netbox/templates/extras/inc/report_label.html | 4 ++-- netbox/templates/extras/report.html | 2 +- netbox/templates/extras/report_list.html | 2 +- netbox/templates/home.html | 15 +++++++++++++++ 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index 1c21e58b7..e5fb311db 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -15,7 +15,7 @@ from circuits.tables import CircuitTable, ProviderTable from dcim.filters import DeviceFilter, DeviceTypeFilter, RackFilter, SiteFilter from dcim.models import ConsolePort, Device, DeviceType, InterfaceConnection, PowerPort, Rack, Site from dcim.tables import DeviceDetailTable, DeviceTypeTable, RackTable, SiteTable -from extras.models import TopologyMap, UserAction +from extras.models import ReportResult, TopologyMap, UserAction from ipam.filters import AggregateFilter, IPAddressFilter, PrefixFilter, VLANFilter, VRFFilter from ipam.models import Aggregate, IPAddress, Prefix, VLAN, VRF from ipam.tables import AggregateTable, IPAddressTable, PrefixTable, VLANTable, VRFTable @@ -177,6 +177,7 @@ class HomeView(View): 'search_form': SearchForm(), 'stats': stats, 'topology_maps': TopologyMap.objects.filter(site__isnull=True), + 'report_results': ReportResult.objects.order_by('-created')[:10], 'recent_activity': UserAction.objects.select_related('user')[:50] }) diff --git a/netbox/templates/extras/inc/report_label.html b/netbox/templates/extras/inc/report_label.html index 67fc0556b..d4d2c5919 100644 --- a/netbox/templates/extras/inc/report_label.html +++ b/netbox/templates/extras/inc/report_label.html @@ -1,6 +1,6 @@ -{% if report.result.failed %} +{% if result.failed %} -{% elif report.result %} +{% elif result %} {% else %} diff --git a/netbox/templates/extras/report.html b/netbox/templates/extras/report.html index 2c087e437..050d6e445 100644 --- a/netbox/templates/extras/report.html +++ b/netbox/templates/extras/report.html @@ -22,7 +22,7 @@ {% endif %} -

{{ report.name }}{% include 'extras/inc/report_label.html' %}

+

{{ report.name }}{% include 'extras/inc/report_label.html' with result=report.result %}

{% if report.description %} diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html index 9cba1a71b..1d6fbb72e 100644 --- a/netbox/templates/extras/report_list.html +++ b/netbox/templates/extras/report_list.html @@ -24,7 +24,7 @@ {{ report.name }} - {% include 'extras/inc/report_label.html' %} + {% include 'extras/inc/report_label.html' with result=report.result %} {{ report.description|default:"" }} {% if report.result %} diff --git a/netbox/templates/home.html b/netbox/templates/home.html index beb157f1a..46bfdbbd5 100644 --- a/netbox/templates/home.html +++ b/netbox/templates/home.html @@ -150,6 +150,21 @@
{% endif %}
+ {% if report_results %} +
+
+ Reports +
+ + {% for result in report_results %} + + + + + {% endfor %} +
{{ result.report }}{% include 'extras/inc/report_label.html' %}
+
+ {% endif %}
Recent Activity