Refactor reports out of pages and into reports-specific files

wagtail/admin/templates/wagtailadmin/home/locked_pages.html

@@ -3,7 +3,7 @@
     <div class="panel nice-padding">{# TODO try moving these classes onto the section tag #}
         <section>
             <h2>{% trans "Your locked pages" %}</h2>
-            <a href="{% url 'wagtailadmin_pages:locked_pages' %}" class="button button-small button-secondary">See all locked pages</a>
+            <a href="{% url 'wagtailadmin_reports:locked_pages' %}" class="button button-small button-secondary">See all locked pages</a>
             <table class="listing listing-page">
                 <col />
                 <col width="15%"/>

wagtail/admin/templates/wagtailadmin/reports/locked_pages.html

@@ -7,6 +7,6 @@
     {% include "wagtailadmin/shared/header.html" with title=title icon="locked" %}
 
     <div id="page-results">
-        {% include "wagtailadmin/pages/locked_pages_results.html" %}
+        {% include "wagtailadmin/reports/locked_pages_results.html" %}
     </div>
 {% endblock %}

wagtail/admin/templates/wagtailadmin/reports/locked_pages_results.html

@@ -1,9 +1,9 @@
 {% load i18n wagtailadmin_tags %}
 <div class="nice-padding">
     {% if pages %}
-        {% include "wagtailadmin/pages/listing/_list_unlock.html" %}
+        {% include "wagtailadmin/reports/listing/_list_unlock.html" %}
 
-        {% url 'wagtailadmin_pages:locked_pages' as pagination_base_url %}
+        {% url 'wagtailadmin_reports:locked_pages' as pagination_base_url %}
         {% paginate pages base_url=pagination_base_url %}
     {% else %}
         <p>{% trans 'No pages have been locked.' %}</p>

wagtail/admin/urls/__init__.py

@@ -9,6 +9,7 @@ from django.views.defaults import page_not_found
 from wagtail.admin.auth import require_admin_access
 from wagtail.admin.urls import pages as wagtailadmin_pages_urls
 from wagtail.admin.urls import collections as wagtailadmin_collections_urls
+from wagtail.admin.urls import reports as wagtailadmin_reports_urls
 from wagtail.admin.urls import password_reset as wagtailadmin_password_reset_urls
 from wagtail.admin.views import account, chooser, home, pages, tags, userbar
 from wagtail.admin.api import urls as api_urls
@@ -44,6 +45,8 @@ urlpatterns = [
 
     url(r'^collections/', include(wagtailadmin_collections_urls, namespace='wagtailadmin_collections')),
 
+    url(r'^reports/', include(wagtailadmin_reports_urls, namespace='wagtailadmin_reports')),
+
     url(r'^account/$', account.account, name='wagtailadmin_account'),
     url(r'^account/change_password/$', account.change_password, name='wagtailadmin_account_change_password'),
     url(r'^account/change_email/$', account.change_email, name='wagtailadmin_account_change_email'),

wagtail/admin/urls/pages.py

@@ -33,7 +33,6 @@ urlpatterns = [
 
     url(r'^(\d+)/lock/$', pages.lock, name='lock'),
     url(r'^(\d+)/unlock/$', pages.unlock, name='unlock'),
-    url(r'^locked/$', pages.locked_pages, name='locked_pages'),
 
     url(r'^(\d+)/revisions/$', pages.revisions_index, name='revisions_index'),
     url(r'^(\d+)/revisions/(\d+)/view/$', pages.revisions_view, name='revisions_view'),

wagtail/admin/urls/reports.py

@@ -0,0 +1,8 @@
+from django.conf.urls import url
+
+from wagtail.admin.views import reports
+
+app_name = 'wagtailadmin_reports'
+urlpatterns = [
+    url(r'^locked/$', reports.locked_pages, name='locked_pages')
+]

wagtail/admin/views/pages.py

@@ -1285,14 +1285,3 @@ def revisions_unschedule(request, page_id, revision_id):
         'next': next_url,
         'subtitle': subtitle
     })
-
-
-def locked_pages(request):
-    pages = UserPagePermissionsProxy(request.user).editable_pages().filter(locked=True)
-
-    paginator = Paginator(pages, per_page=10)
-    pages = paginator.get_page(request.GET.get('p'))
-
-    return render(request, 'wagtailadmin/pages/locked_pages.html', {
-        'pages': pages,
-    })

wagtail/admin/views/reports.py

@@ -0,0 +1,14 @@
+from django.core.paginator import Paginator
+from django.shortcuts import render
+from wagtail.core.models import UserPagePermissionsProxy
+
+
+def locked_pages(request):
+    pages = UserPagePermissionsProxy(request.user).editable_pages().filter(locked=True)
+
+    paginator = Paginator(pages, per_page=10)
+    pages = paginator.get_page(request.GET.get('p'))
+
+    return render(request, 'wagtailadmin/reports/locked_pages.html', {
+        'pages': pages,
+    })

wagtail/admin/wagtail_hooks.py

@@ -617,18 +617,14 @@ def register_core_features(features):
 
 class ReportsMenuItem(SubmenuMenuItem):
     template = 'wagtailadmin/shared/menu_submenu_item.html'
-    def is_shown(self, request):
-        return True
 
 
 class LockedPagesMenuItem(MenuItem):
-    def is_shown(self, request):
-        return True
-
+    pass
 
 @hooks.register('register_reports_menu_item')
 def register_locked_pages_menu_item():
-    return LockedPagesMenuItem(_('Locked Pages'), reverse('wagtailadmin_pages:locked_pages'), classnames='icon icon-locked', order=700)
+    return LockedPagesMenuItem(_('Locked Pages'), reverse('wagtailadmin_reports:locked_pages'), classnames='icon icon-locked', order=700)
 
 
 @hooks.register('register_admin_menu_item')