From 50839fcb6b2829f8228feb2e406ea274e7866862 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Wed, 28 Aug 2024 15:05:55 -0400
Subject: [PATCH] Fixes #16756: Fix table pagination for custom script results

---
 netbox/extras/views.py                          | 3 +++
 netbox/templates/extras/htmx/script_result.html | 6 +++++-
 netbox/templates/extras/script_result.html      | 8 --------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index b33c1e22a..0a2c79222 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -1258,6 +1258,9 @@ class ScriptResultView(TableMixin, generic.ObjectView):
 
         # If this is an HTMX request, return only the result HTML
         if htmx_partial(request):
+            if request.GET.get('log'):
+                # If log=True, render only the log table
+                return render(request, 'htmx/table.html', context)
             response = render(request, 'extras/htmx/script_result.html', context)
             if job.completed or not job.started:
                 response.status_code = 286
diff --git a/netbox/templates/extras/htmx/script_result.html b/netbox/templates/extras/htmx/script_result.html
index 3fe03bbe7..ab1cb9087 100644
--- a/netbox/templates/extras/htmx/script_result.html
+++ b/netbox/templates/extras/htmx/script_result.html
@@ -41,7 +41,11 @@
     <div class="card">
       <div class="table-responsive" id="object_list">
         <h5 class="card-header">{% trans "Log" %}</h5>
-        {% include 'htmx/table.html' %}
+        <div class="htmx-container table-responsive"
+          hx-get="{% url 'extras:script_result' job_pk=job.pk %}?embedded=True&log=True"
+          hx-target="this"
+          hx-trigger="load" hx-select=".htmx-container" hx-swap="outerHTML"
+        ></div>
       </div>
     </div>
     {% endif %}
diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html
index 1b297673b..3e158e1f6 100644
--- a/netbox/templates/extras/script_result.html
+++ b/netbox/templates/extras/script_result.html
@@ -90,14 +90,6 @@
     </div>
     {# /Object list tab #}
 
-    {# Filters tab #}
-    {% if filter_form %}
-      <div class="tab-pane show" id="filters-form" role="tabpanel" aria-labelledby="filters-form-tab">
-        {% include 'inc/filter_list.html' %}
-      </div>
-    {% endif %}
-    {# /Filters tab #}
-
 {% endblock content %}
 
 {% block modals %}