From 305d88ebda903073acdeeed5fd3201644dfb5742 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Wed, 15 Dec 2021 08:36:03 -0500
Subject: [PATCH] Fixes #8079: Fix validation of LLDP neighbors when connected
 device has an asset tag

---
 docs/release-notes/version-3.1.md                | 1 +
 netbox/templates/dcim/device/lldp_neighbors.html | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md
index 723a4bb23..432dbbcad 100644
--- a/docs/release-notes/version-3.1.md
+++ b/docs/release-notes/version-3.1.md
@@ -11,6 +11,7 @@
 
 * [#7674](https://github.com/netbox-community/netbox/issues/7674) - Fix inadvertent application of device type context to virtual machines
 * [#8074](https://github.com/netbox-community/netbox/issues/8074) - Ordering VMs by name should reference naturalized value
+* [#8079](https://github.com/netbox-community/netbox/issues/8079) - Fix validation of LLDP neighbors when connected device has an asset tag
 
 ---
 
diff --git a/netbox/templates/dcim/device/lldp_neighbors.html b/netbox/templates/dcim/device/lldp_neighbors.html
index b3b2eeae8..adf8efdce 100644
--- a/netbox/templates/dcim/device/lldp_neighbors.html
+++ b/netbox/templates/dcim/device/lldp_neighbors.html
@@ -31,12 +31,12 @@
                 <tbody>
                     {% for iface in interfaces %}
                         <tr id="{{ iface.name }}">
-                            <td class="font-monospace">{{ iface }}</td>
+                            <td>{{ iface }}</td>
                             {% if iface.connected_endpoint.device %}
-                                <td class="configured_device" data="{{ iface.connected_endpoint.device }}" data-chassis="{{ iface.connected_endpoint.device.virtual_chassis.name }}">
+                                <td class="configured_device" data="{{ iface.connected_endpoint.device.name }}" data-chassis="{{ iface.connected_endpoint.device.virtual_chassis.name }}">
                                     <a href="{% url 'dcim:device' pk=iface.connected_endpoint.device.pk %}">{{ iface.connected_endpoint.device }}</a>
                                 </td>
-                                <td class="configured_interface" data="{{ iface.connected_endpoint }}">
+                                <td class="configured_interface" data="{{ iface.connected_endpoint.name }}">
                                     <span title="{{ iface.connected_endpoint.get_type_display }}">{{ iface.connected_endpoint }}</span>
                                 </td>
                             {% elif iface.connected_endpoint.circuit %}