From 69570044b1421ce73d5ad0ae723978e65870ef5b Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Mon, 30 Mar 2020 17:20:06 +0100 Subject: [PATCH] Add test for workflow report and fix warning about paginating unordered queries --- wagtail/admin/tests/test_workflows.py | 9 +++++++++ wagtail/admin/views/reports.py | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/wagtail/admin/tests/test_workflows.py b/wagtail/admin/tests/test_workflows.py index 62843dd643..af472d19c2 100644 --- a/wagtail/admin/tests/test_workflows.py +++ b/wagtail/admin/tests/test_workflows.py @@ -617,6 +617,15 @@ class TestApproveRejectWorkflow(TestCase, WagtailTestUtils): # Check that the user received a 403 response self.assertEqual(response.status_code, 403) + def test_workflow_report(self): + response = self.client.get(reverse('wagtailadmin_reports:workflow')) + self.assertEqual(response.status_code, 200) + self.assertContains(response, "Hello world!") + + response = self.client.get(reverse('wagtailadmin_reports:workflow_tasks')) + self.assertEqual(response.status_code, 200) + self.assertContains(response, "Hello world!") + class TestNotificationPreferences(TestCase, WagtailTestUtils): def setUp(self): diff --git a/wagtail/admin/views/reports.py b/wagtail/admin/views/reports.py index 8c3346759d..39d1b563f4 100644 --- a/wagtail/admin/views/reports.py +++ b/wagtail/admin/views/reports.py @@ -280,7 +280,7 @@ class WorkflowView(ReportView): def get_queryset(self): pages = UserPagePermissionsProxy(self.request.user).editable_pages() - return WorkflowState.objects.filter(page__in=pages) + return WorkflowState.objects.filter(page__in=pages).order_by('-created_at') class WorkflowTasksView(ReportView): @@ -290,4 +290,4 @@ class WorkflowTasksView(ReportView): def get_queryset(self): pages = UserPagePermissionsProxy(self.request.user).editable_pages() - return TaskState.objects.filter(workflow_state__page__in=pages) + return TaskState.objects.filter(workflow_state__page__in=pages).order_by('-started_at')