From 17e6d1076a0a8093a6c53f603a36d2e3df6279b8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Thu, 2 May 2024 10:43:53 -0400
Subject: [PATCH] Fixes #15852: Update total object counts when filtering
 object lists (#15909)

* Fixes #15852: Update total object counts when filtering object lists

* Misc cleanup
---
 netbox/templates/generic/object_list.html | 7 ++++---
 netbox/templates/htmx/table.html          | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index bf0777406..3b06e5622 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -43,7 +43,8 @@ Context:
   <ul class="nav nav-tabs" role="tablist">
     <li class="nav-item" role="presentation">
       <a class="nav-link active" id="object-list-tab" data-bs-toggle="tab" data-bs-target="#object-list" type="button" role="tab" aria-controls="edit-form" aria-selected="true">
-        {% trans "Results" %} {% badge table.page.paginator.count %}
+        {% trans "Results" %}
+        <span class="badge text-bg-secondary total-object-count">{{ table.page.paginator.count }}</span>
       </a>
     </li>
     {% if filter_form %}
@@ -88,8 +89,8 @@ Context:
                 <div class="form-check">
                   <input type="checkbox" id="select-all" name="_all" class="form-check-input" />
                   <label for="select-all" class="form-check-label">
-                    {% blocktrans trimmed with count=table.rows|length object_type_plural=table.data.verbose_name_plural %}
-                      Select <strong>all {{ count }} {{ object_type_plural }}</strong> matching query
+                    {% blocktrans trimmed with count=table.page.paginator.count object_type_plural=table.data.verbose_name_plural %}
+                      Select <strong>all <span class="total-object-count">{{ count }}</span> {{ object_type_plural }}</strong> matching query
                     {% endblocktrans %}
                   </label>
                 </div>
diff --git a/netbox/templates/htmx/table.html b/netbox/templates/htmx/table.html
index 1ad1a7bc1..3524c0c4c 100644
--- a/netbox/templates/htmx/table.html
+++ b/netbox/templates/htmx/table.html
@@ -11,3 +11,6 @@
     {% include 'inc/paginator.html' with htmx=True table=table paginator=table.paginator page=table.page %}
   {% endif %}
 {% endwith %}
+
+{# Include the updated object count for display elsewhere on the page #}
+<div hx-swap-oob="innerHTML:.total-object-count">{{ table.rows|length }}</div>