From 4044ae8f8a96df98747ba56cdc771ec1a5f8797e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Tue, 12 Aug 2025 15:07:56 -0400
Subject: [PATCH] #18204: Misc cleanup

---
 netbox/extras/tables/tables.py                     | 8 ++++----
 netbox/templates/inc/panels/image_attachments.html | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/netbox/extras/tables/tables.py b/netbox/extras/tables/tables.py
index 2a8d89a5c..5c1a63d26 100644
--- a/netbox/extras/tables/tables.py
+++ b/netbox/extras/tables/tables.py
@@ -40,9 +40,8 @@ __all__ = (
 
 IMAGEATTACHMENT_IMAGE = """
 {% if record.image %}
-  <a class="image-preview" href="{{ record.image.url }}" target="_blank">
-    <i class="mdi mdi-image"></i>
-  </a>
+  <a href="{{ record.image.url }}" target="_blank" class="image-preview" data-bs-placement="top">
+    <i class="mdi mdi-image"></i></a>
 {% endif %}
 <a href="{{ record.get_absolute_url }}">{{ record }}</a>
 """
@@ -236,6 +235,7 @@ class ImageAttachmentTable(NetBoxTable):
     image = columns.TemplateColumn(
         verbose_name=_('Image'),
         template_code=IMAGEATTACHMENT_IMAGE,
+        attrs={'td': {'class': 'text-nowrap'}}
     )
     name = tables.Column(
         verbose_name=_('Name'),
@@ -255,7 +255,7 @@ class ImageAttachmentTable(NetBoxTable):
         verbose_name=_('Object Type'),
     )
     parent = tables.Column(
-        verbose_name=_('Parent'),
+        verbose_name=_('Object'),
         linkify=True,
         orderable=False,
     )
diff --git a/netbox/templates/inc/panels/image_attachments.html b/netbox/templates/inc/panels/image_attachments.html
index 2ad715335..8e5691ef5 100644
--- a/netbox/templates/inc/panels/image_attachments.html
+++ b/netbox/templates/inc/panels/image_attachments.html
@@ -6,7 +6,7 @@
     {% trans "Images" %}
     {% if perms.extras.add_imageattachment %}
       <div class="card-actions">
-        <a href="{% url 'extras:imageattachment_add' %}?object_type={{ object|content_type_id }}&object_id={{ object.pk }}" class="btn btn-ghost-primary btn-sm">
+        <a href="{% url 'extras:imageattachment_add' %}?object_type={{ object|content_type_id }}&object_id={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-ghost-primary btn-sm">
           <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Attach an image" %}
         </a>
       </div>