From 3f766ffea805a96c4bbb9621ac26b722ac7354e8 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Thu, 7 Oct 2021 09:37:21 -0400
Subject: [PATCH] Fixes #7474: Fix AttributeError exception when rendering a
 report or custom script

---
 docs/release-notes/version-3.0.md    |  8 ++++++++
 netbox/templates/extras/report.html  |  4 ++++
 netbox/templates/extras/script.html  |  4 ++++
 netbox/templates/generic/object.html | 12 +++++++-----
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md
index 41c551d9c..6f647d472 100644
--- a/docs/release-notes/version-3.0.md
+++ b/docs/release-notes/version-3.0.md
@@ -1,5 +1,13 @@
 # NetBox v3.0
 
+## v3.0.7 (FUTURE)
+
+### Bug Fixes
+
+* [#7474](https://github.com/netbox-community/netbox/issues/7474) - Fix AttributeError exception when rendering a report or custom script
+
+---
+
 ## v3.0.6 (2021-10-06)
 
 ### Enhancements
diff --git a/netbox/templates/extras/report.html b/netbox/templates/extras/report.html
index 2d65dc88e..c61cc92c5 100644
--- a/netbox/templates/extras/report.html
+++ b/netbox/templates/extras/report.html
@@ -3,6 +3,10 @@
 
 {% block title %}{{ report.name }}{% endblock %}
 
+{% block object_identifier %}
+  {{ report.full_name }}
+{% endblock %}
+
 {% block breadcrumbs %}
   <li class="breadcrumb-item"><a href="{% url 'extras:report_list' %}">Reports</a></li>
   <li class="breadcrumb-item"><a href="{% url 'extras:report_list' %}#module.{{ report.module }}">{{ report.module|bettertitle }}</a></li>
diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html
index 2c59afe6d..3a50e09a1 100644
--- a/netbox/templates/extras/script.html
+++ b/netbox/templates/extras/script.html
@@ -5,6 +5,10 @@
 
 {% block title %}{{ script }}{% endblock %}
 
+{% block object_identifier %}
+  {{ script.full_name }}
+{% endblock %}
+
 {% block breadcrumbs %}
   <li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}">Scripts</a></li>
   <li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}#module.{{ module }}">{{ module|bettertitle }}</a></li>
diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html
index 7be7f811c..24285846f 100644
--- a/netbox/templates/generic/object.html
+++ b/netbox/templates/generic/object.html
@@ -9,15 +9,17 @@
   {# Breadcrumbs #}
   <nav class="breadcrumb-container px-3" aria-label="breadcrumb">
     <div class="float-end">
-      <code class="text-muted" title="Object type and ID">
-        {{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}:{{ object.pk }}
-        {% if object.slug %}({{ object.slug }}){% endif %}
-      </code>
+        <code class="text-muted">
+          {% block object_identifier %}
+            {{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}:{{ object.pk }}
+            {% if object.slug %}({{ object.slug }}){% endif %}
+          {% endblock object_identifier %}
+        </code>
     </div>
     <ol class="breadcrumb">
       {% block breadcrumbs %}
         <li class="breadcrumb-item"><a href="{% url object|viewname:'list' %}">{{ object|meta:'verbose_name_plural'|bettertitle }}</a></li>
-      {% endblock %}
+      {% endblock breadcrumbs %}
     </ol>
   </nav>
   {{ block.super }}