From 479c69bd2dabe58fa4d0f0a1fb85410cf67cfa4e Mon Sep 17 00:00:00 2001
From: Daniel Sheppard <dans@dansheps.com>
Date: Mon, 22 Apr 2024 22:42:42 -0500
Subject: [PATCH] Fix up duplication of template chits when rendering HTMX

---
 netbox/netbox/views/generic/bulk_views.py | 9 +++++++--
 netbox/templates/htmx/table.html          | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py
index c62c375c4..9ea6cb8eb 100644
--- a/netbox/netbox/views/generic/bulk_views.py
+++ b/netbox/netbox/views/generic/bulk_views.py
@@ -11,6 +11,7 @@ from django.db.models.fields.reverse_related import ManyToManyRel
 from django.forms import HiddenInput, ModelMultipleChoiceField, MultipleHiddenInput
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404, redirect, render
+from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext as _
@@ -180,10 +181,14 @@ class ObjectListView(BaseMultiObjectView, ActionsMixin, TableMixin):
                 # Hide selection checkboxes
                 if 'pk' in table.base_columns:
                     table.columns.hide('pk')
-            return render(request, 'htmx/table.html', {
+
+            applied_filters = render_to_string('inc/applied_filters_pane.html', {
                 'model': model,
-                'table': table,
                 'filter_form': filterset_form,
+            }, request)
+            return render(request, 'htmx/table.html', {
+                'table': table,
+                'applied_filters': applied_filters,
             })
 
         context = {
diff --git a/netbox/templates/htmx/table.html b/netbox/templates/htmx/table.html
index 3de4ae732..10544e641 100644
--- a/netbox/templates/htmx/table.html
+++ b/netbox/templates/htmx/table.html
@@ -2,8 +2,8 @@
 {% load helpers %}
 {% load render_table from django_tables2 %}
 
-{# Applied filters #}
-{% include 'inc/applied_filters_pane.html' %}
+{# Applied filters for OOB Swap #}
+{{ applied_filters }}
 
 {% with preferences|get_key:"pagination.placement" as paginator_placement %}
   {% if paginator_placement == 'top' or paginator_placement == 'both' %}