From e1d1aab4bdf116f395e22896b0278c11c703ab53 Mon Sep 17 00:00:00 2001
From: Alexander Haase <ahaase@alexhaase.de>
Date: Fri, 7 Feb 2025 22:54:53 +0100
Subject: [PATCH] Omit empty related models

---
 netbox/templates/inc/panels/related_objects.html | 2 ++
 netbox/utilities/views.py                        | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/netbox/templates/inc/panels/related_objects.html b/netbox/templates/inc/panels/related_objects.html
index 15dbf6036..c013c14c5 100644
--- a/netbox/templates/inc/panels/related_objects.html
+++ b/netbox/templates/inc/panels/related_objects.html
@@ -19,6 +19,8 @@
         </a>
         {% endif %}
       {% endwith %}
+    {% empty %}
+      <span class="list-group-item text-muted">{% trans "None" %}</span>
     {% endfor %}
   </ul>
 </div>
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index b3334ca87..b9a5f85fb 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -196,7 +196,10 @@ class GetRelatedModelsMixin:
         ]
         related_models.extend(extra)
 
-        return sorted(related_models, key=lambda x: x[0].model._meta.verbose_name.lower())
+        return sorted(
+            filter(lambda qs: qs[0].exists(), related_models),
+            key=lambda qs: qs[0].model._meta.verbose_name.lower(),
+        )
 
 
 class ViewTab: