From 2c7fc5df7540adca93aeead41ed1a6e84095f3b0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Fri, 4 Dec 2020 15:56:33 -0500
Subject: [PATCH] Closes #5411: Include cable tags in trace view

---
 docs/release-notes/version-2.10.md     |  4 ++++
 netbox/templates/dcim/trace/cable.html | 16 ++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md
index cfef8288e..81847548c 100644
--- a/docs/release-notes/version-2.10.md
+++ b/docs/release-notes/version-2.10.md
@@ -2,6 +2,10 @@
 
 ## v2.10-beta3 (FUTURE)
 
+### Enhancements
+
+* [#5411](https://github.com/netbox-community/netbox/issues/5411) - Include cable tags in trace view
+
 ### Bug Fixes
 
 * [#5417](https://github.com/netbox-community/netbox/issues/5417) - Fix exception when viewing a device installed within a device bay
diff --git a/netbox/templates/dcim/trace/cable.html b/netbox/templates/dcim/trace/cable.html
index cd1fd9398..4235768a6 100644
--- a/netbox/templates/dcim/trace/cable.html
+++ b/netbox/templates/dcim/trace/cable.html
@@ -1,3 +1,5 @@
+{% load helpers %}
+
 <div class="cable" style="border-left-color: #{{ cable.color|default:'606060' }}; {% if cable.status != 'connected' %} border-left-style: dashed{% endif %}">
     <strong>
         <a href="{% url 'dcim:cable' pk=cable.pk %}">
@@ -5,11 +7,13 @@
         </a>
     </strong><br />
     {% if cable.type %}
-        {{ cable.get_type_display|default:"" }}
-        {% if cable.length %}
-            ({{ cable.length }} {{ cable.get_length_unit_display }})
-        {% endif %}
-        <br />
+        {{ cable.get_type_display|default:"" }}<br />
     {% endif %}
-    <span class="label label-{{ cable.get_status_class }}">{{ cable.get_status_display }}</span>
+    {% if cable.length %}
+        ({{ cable.length }} {{ cable.get_length_unit_display }})<br />
+    {% endif %}
+    <span class="label label-{{ cable.get_status_class }}">{{ cable.get_status_display }}</span><br />
+    {% for tag in cable.tags.all %}
+        {% tag tag 'dcim:cable_list' %}
+    {% endfor %}
 </div>