From e6cd2b9483c053863d7cb5c387cd2a9537e5fda3 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Fri, 1 May 2020 16:46:31 +0100
Subject: [PATCH] Move pagination controls into base report

---
 .../admin/templates/wagtailadmin/reports/base_page_report.html | 1 -
 wagtail/admin/templates/wagtailadmin/reports/base_report.html  | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/wagtail/admin/templates/wagtailadmin/reports/base_page_report.html b/wagtail/admin/templates/wagtailadmin/reports/base_page_report.html
index e68ab995f1..924a7d63ae 100644
--- a/wagtail/admin/templates/wagtailadmin/reports/base_page_report.html
+++ b/wagtail/admin/templates/wagtailadmin/reports/base_page_report.html
@@ -8,7 +8,6 @@
                 {% block listing %}
                     {% include "wagtailadmin/reports/listing/_list_page_report.html" %}
                 {% endblock %}
-                {% paginate pages base_url=request.path %}
             {% else %}
                 {% block no_results %}
                     <p>{% trans "No pages match this report's criteria." %}</p>
diff --git a/wagtail/admin/templates/wagtailadmin/reports/base_report.html b/wagtail/admin/templates/wagtailadmin/reports/base_report.html
index 4137fd733b..901b7bd6ee 100644
--- a/wagtail/admin/templates/wagtailadmin/reports/base_report.html
+++ b/wagtail/admin/templates/wagtailadmin/reports/base_report.html
@@ -34,6 +34,9 @@
         <div class="report__results">
             {% block results %}
             {% endblock %}
+            {% if page_obj %}
+                {% paginate page_obj base_url=request.path %}
+            {% endif %}
         </div>
         {% if filters %}
             <div class="report__filters">