From d34f188d40b11d7d70d5d46cbc3f9accb2d876a8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Fri, 5 Apr 2024 14:22:09 -0400
Subject: [PATCH] Fixes #15637: Fix rendering of links from within embedded
 tables w/HTMX enabled (#15642)

* Add htmx_table to __all__

* Fix dropdown menu clipping

* Fix loading links from within embedded tables

* Fix rendering of object deletion warning
---
 netbox/netbox/views/generic/object_views.py         | 2 +-
 netbox/templates/generic/object_delete.html         | 2 +-
 netbox/templates/inc/table_htmx.html                | 3 +--
 netbox/utilities/htmx.py                            | 2 +-
 netbox/utilities/templates/builtins/htmx_table.html | 2 +-
 netbox/utilities/templatetags/builtins/tags.py      | 1 +
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/netbox/netbox/views/generic/object_views.py b/netbox/netbox/views/generic/object_views.py
index 616867603..d9ac2e9ff 100644
--- a/netbox/netbox/views/generic/object_views.py
+++ b/netbox/netbox/views/generic/object_views.py
@@ -381,7 +381,7 @@ class ObjectDeleteView(GetReturnURLMixin, BaseObjectView):
             return self._handle_protected_objects(obj, e.restricted_objects, request, e)
 
         # If this is an HTMX request, return only the rendered deletion form as modal content
-        if request.htmx:
+        if htmx_partial(request):
             viewname = get_viewname(self.queryset.model, action='delete')
             form_url = reverse(viewname, kwargs={'pk': obj.pk})
             return render(request, 'htmx/delete_form.html', {
diff --git a/netbox/templates/generic/object_delete.html b/netbox/templates/generic/object_delete.html
index e45370212..f5ce50ead 100644
--- a/netbox/templates/generic/object_delete.html
+++ b/netbox/templates/generic/object_delete.html
@@ -18,7 +18,7 @@ Context:
 {% block content %}
   <div class="modal" tabindex="-1" style="display: block; position: static">
     <div class="modal-dialog">
-      <div class="modal-content" >
+      <div class="modal-content border-1 border-danger">
         {% include 'htmx/delete_form.html' %}
       </div>
     </div>
diff --git a/netbox/templates/inc/table_htmx.html b/netbox/templates/inc/table_htmx.html
index 7fb78dfe4..06d3d9b72 100644
--- a/netbox/templates/inc/table_htmx.html
+++ b/netbox/templates/inc/table_htmx.html
@@ -1,9 +1,8 @@
 {% load django_tables2 %}
-<table{% if table.attrs %} {{ table.attrs.as_html }}{% endif %}>
+<table{% if table.attrs %} {{ table.attrs.as_html }}{% endif %} hx-disinherit="hx-target hx-select hx-swap">
   {% if table.show_header %}
     <thead
         hx-target="closest .htmx-container"
-        hx-disinherit="hx-select hx-swap"
         {% if not table.embedded %} hx-push-url="true"{% endif %}
     >
       <tr>
diff --git a/netbox/utilities/htmx.py b/netbox/utilities/htmx.py
index 9f86397bc..91a2c5ada 100644
--- a/netbox/utilities/htmx.py
+++ b/netbox/utilities/htmx.py
@@ -10,4 +10,4 @@ def htmx_partial(request):
     Determines whether to render partial (versus complete) HTML content
     in response to an HTMX request, based on the target element.
     """
-    return request.htmx and request.htmx.target != PAGE_CONTAINER_ID
+    return request.htmx and request.htmx.target and request.htmx.target != PAGE_CONTAINER_ID
diff --git a/netbox/utilities/templates/builtins/htmx_table.html b/netbox/utilities/templates/builtins/htmx_table.html
index d294fbab4..6a7959573 100644
--- a/netbox/utilities/templates/builtins/htmx_table.html
+++ b/netbox/utilities/templates/builtins/htmx_table.html
@@ -1,4 +1,4 @@
-<div class="card-body htmx-container table-responsive p-0"
+<div class="htmx-container table-responsive"
   hx-get="{% url viewname %}{% if url_params %}?{{ url_params.urlencode }}{% endif %}"
   hx-target="this"
   hx-trigger="load" hx-select="table" hx-swap="innerHTML"
diff --git a/netbox/utilities/templatetags/builtins/tags.py b/netbox/utilities/templatetags/builtins/tags.py
index b2ef2d4e6..bc5c954be 100644
--- a/netbox/utilities/templatetags/builtins/tags.py
+++ b/netbox/utilities/templatetags/builtins/tags.py
@@ -8,6 +8,7 @@ __all__ = (
     'checkmark',
     'copy_content',
     'customfield_value',
+    'htmx_table',
     'formaction',
     'tag',
 )