From 1063db94701c10fe36e4264e26f8f8b3479c2119 Mon Sep 17 00:00:00 2001
From: Jamie Murphy <jamiemurphyit@gmail.com>
Date: Fri, 8 Sep 2023 00:20:50 +0100
Subject: [PATCH] some items were not showing (eg ips on devices)

---
 netbox/netbox/views/generic/object_views.py | 9 +++++----
 netbox/templates/htmx/delete_form.html      | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py
index 6051944f7..4757a77f5 100644
--- a/netbox/netbox/views/generic/object_views.py
+++ b/netbox/netbox/views/generic/object_views.py
@@ -338,10 +338,11 @@ class ObjectDeleteView(GetReturnURLMixin, BaseObjectView):
         using = router.db_for_write(obj._meta.model)
         collector = NestedObjects(using=using)
         collector.collect([obj])
-        if collector.nested():
-            nested_objs = collector.nested()[1]
-        else:
-            nested_objs = []
+        nested_objs = []
+        if collector.instances_with_model():
+            for model, instance in collector.instances_with_model():
+                nested_objs.append(f"{model.__name__} - {instance}")
+            
 
         # If this is an HTMX request, return only the rendered deletion form as modal content
         if is_htmx(request):
diff --git a/netbox/templates/htmx/delete_form.html b/netbox/templates/htmx/delete_form.html
index 150335ae8..9aac23aa6 100644
--- a/netbox/templates/htmx/delete_form.html
+++ b/netbox/templates/htmx/delete_form.html
@@ -15,8 +15,8 @@
     {% if nested_objs %}
     <p>
       This will cause deltion of the following related items: <br>
-      {% for nested_obj in nested_objs %}
-        {{ nested_obj }} <br>
+      {% for nested_obj in nested_objs %} 
+        - {{ nested_obj }} <br>
       {% endfor %}
     </p>
     {% endif %}