From 268b4c854ecf12f76304e8db0261def1598c566f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 30 Jun 2020 09:00:42 -0400
Subject: [PATCH] Closes #4802: Allow changing page size when displaying only a
 single page of results

---
 docs/release-notes/version-2.8.md   |  4 ++++
 netbox/templates/inc/paginator.html | 28 ++++++++++++++--------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/docs/release-notes/version-2.8.md b/docs/release-notes/version-2.8.md
index ca264806b..19de521c0 100644
--- a/docs/release-notes/version-2.8.md
+++ b/docs/release-notes/version-2.8.md
@@ -2,6 +2,10 @@
 
 ## v2.8.7 (FUTURE)
 
+### Enhancements
+
+* [#4802](https://github.com/netbox-community/netbox/issues/4802) - Allow changing page size when displaying only a single page of results
+
 ### Bug Fixes
 
 * [#4766](https://github.com/netbox-community/netbox/issues/4766) - Fix redirect after login when `next` is not specified
diff --git a/netbox/templates/inc/paginator.html b/netbox/templates/inc/paginator.html
index fe9177f87..c0baef070 100644
--- a/netbox/templates/inc/paginator.html
+++ b/netbox/templates/inc/paginator.html
@@ -19,21 +19,21 @@
                 {% endif %}
             </ul>
         </nav>
-        <form method="get">
-            {% for k, v_list in request.GET.lists %}
-                {% if k != 'per_page' %}
-                    {% for v in v_list %}
-                        <input type="hidden" name="{{ k }}" value="{{ v }}" />
-                    {% endfor %}
-                {% endif %}
-            {% endfor %}
-            <select name="per_page" id="per_page">
-                {% for n in settings.PER_PAGE_DEFAULTS %}
-                    <option value="{{ n }}"{% if page.paginator.per_page == n %} selected="selected"{% endif %}>{{ n }}</option>
-                {% endfor %}
-            </select> per page
-        </form>
     {% endif %}
+    <form method="get">
+        {% for k, v_list in request.GET.lists %}
+            {% if k != 'per_page' %}
+                {% for v in v_list %}
+                    <input type="hidden" name="{{ k }}" value="{{ v }}" />
+                {% endfor %}
+            {% endif %}
+        {% endfor %}
+        <select name="per_page" id="per_page">
+            {% for n in settings.PER_PAGE_DEFAULTS %}
+                <option value="{{ n }}"{% if page.paginator.per_page == n %} selected="selected"{% endif %}>{{ n }}</option>
+            {% endfor %}
+        </select> per page
+    </form>
     {% if page %}
         <div class="text-right text-muted">
             Showing {{ page.start_index }}-{{ page.end_index }} of {{ page.paginator.count }}