From 92c4e5bfaf24eba3295d984cb8c487d65d18c346 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Wed, 16 Feb 2022 09:07:01 -0500
Subject: [PATCH] Fixes #8659: Fix display of multi-object custom fields after
 deleting related object

---
 docs/release-notes/version-3.2.md              |  1 +
 netbox/templates/inc/panels/custom_fields.html | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/docs/release-notes/version-3.2.md b/docs/release-notes/version-3.2.md
index e4d8474e4..56bb2755f 100644
--- a/docs/release-notes/version-3.2.md
+++ b/docs/release-notes/version-3.2.md
@@ -147,6 +147,7 @@ Where it is desired to limit the range of available VLANs within a group, users
 ### Bug Fixes (From Beta)
 
 * [#8655](https://github.com/netbox-community/netbox/issues/8655) - Fix AttributeError when viewing cabled interfaces
+* [#8659](https://github.com/netbox-community/netbox/issues/8659) - Fix display of multi-object custom fields after deleting related object
 
 ### Other Changes
 
diff --git a/netbox/templates/inc/panels/custom_fields.html b/netbox/templates/inc/panels/custom_fields.html
index eea94fdc3..88a4660f2 100644
--- a/netbox/templates/inc/panels/custom_fields.html
+++ b/netbox/templates/inc/panels/custom_fields.html
@@ -12,7 +12,9 @@
                               <span title="{{ field.description|escape }}">{{ field }}</span>
                             </td>
                             <td>
-                                {% if field.type == 'longtext' and value %}
+                                {% if field.type == 'integer' and value is not None %}
+                                    {{ value }}
+                                {% elif field.type == 'longtext' and value %}
                                     {{ value|markdown }}
                                 {% elif field.type == 'boolean' and value == True %}
                                     {% checkmark value true="True" %}
@@ -27,14 +29,12 @@
                                 {% elif field.type == 'object' and value %}
                                     <a href="{{ value.get_absolute_url }}">{{ value }}</a>
                                 {% elif field.type == 'multiobject' and value %}
-                                    {% if value %}
-                                      <ul>
-                                        {% for obj in value %}
-                                          <li><a href="{{ obj.get_absolute_url }}">{{ obj }}</a></li>
-                                        {% endfor %}
-                                      </ul>
-                                    {% endif %}
-                                {% elif value is not None %}
+                                    <ul>
+                                      {% for obj in value %}
+                                        <li><a href="{{ obj.get_absolute_url }}">{{ obj }}</a></li>
+                                      {% endfor %}
+                                    </ul>
+                                {% elif value %}
                                     {{ value }}
                                 {% elif field.required %}
                                     <span class="text-warning">Not defined</span>