From 741bf11462eddb4b9de6763c67406cbc8c468be8 Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Thu, 23 May 2024 12:14:49 -0700
Subject: [PATCH 1/3] 16252 only show results count if paginator

---
 netbox/templates/generic/object_list.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index f2af50d3db0..30b3c3c2cef 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -48,7 +48,9 @@
     <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" %}
+        {% if table.page.paginator %}
         <span class="badge text-bg-secondary total-object-count">{{ table.page.paginator.count }}</span>
+        {% endif %}
       </a>
     </li>
     {% if filter_form %}

From 4aa430af318c25f3dcf8ac96705a09b0dec98936 Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Wed, 5 Jun 2024 11:51:44 -0700
Subject: [PATCH 2/3] 16252 hack in table page count

---
 netbox/dcim/views.py                      | 1 +
 netbox/templates/generic/object_list.html | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 67099523105..4b4c450e4d9 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -651,6 +651,7 @@ def get(self, request):
             'rack_face': rack_face,
             'filter_form': forms.RackElevationFilterForm(request.GET),
             'model': self.queryset.model,
+            'table': {'page': page},  # hack to show count in Result tab
         })
 
 
diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 30b3c3c2cef..f2af50d3db0 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -48,9 +48,7 @@
     <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" %}
-        {% if table.page.paginator %}
         <span class="badge text-bg-secondary total-object-count">{{ table.page.paginator.count }}</span>
-        {% endif %}
       </a>
     </li>
     {% if filter_form %}

From 030916e617f316801abbba451f8f8fe556918b7e Mon Sep 17 00:00:00 2001
From: Arthur Hanson <worldnomad@gmail.com>
Date: Thu, 20 Jun 2024 10:09:12 -0700
Subject: [PATCH 3/3] 16252 review changes

---
 netbox/dcim/views.py                      | 1 -
 netbox/templates/generic/object_list.html | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 4b4c450e4d9..67099523105 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -651,7 +651,6 @@ def get(self, request):
             'rack_face': rack_face,
             'filter_form': forms.RackElevationFilterForm(request.GET),
             'model': self.queryset.model,
-            'table': {'page': page},  # hack to show count in Result tab
         })
 
 
diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index f2af50d3db0..aa1f482bfd3 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -48,7 +48,7 @@
     <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" %}
-        <span class="badge text-bg-secondary total-object-count">{{ table.page.paginator.count }}</span>
+        <span class="badge text-bg-secondary total-object-count">{% if table.page.paginator.count %}{{ table.page.paginator.count }}{% else %}{{ total_count }}{% endif %}</span>
       </a>
     </li>
     {% if filter_form %}