From 6931663c7f8b419de77085b918329e23483edd45 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 9 Dec 2021 01:15:58 +0000 Subject: [PATCH] Replace revisions_index view with a redirect to page history --- .../wagtailadmin/pages/revisions/index.html | 15 ------- .../wagtailadmin/pages/revisions/list.html | 40 ------------------- .../wagtailadmin/pages/revisions/results.html | 9 ----- wagtail/admin/tests/pages/test_revisions.py | 29 +------------- wagtail/admin/views/pages/revisions.py | 21 +--------- 5 files changed, 3 insertions(+), 111 deletions(-) delete mode 100644 wagtail/admin/templates/wagtailadmin/pages/revisions/index.html delete mode 100644 wagtail/admin/templates/wagtailadmin/pages/revisions/list.html delete mode 100644 wagtail/admin/templates/wagtailadmin/pages/revisions/results.html diff --git a/wagtail/admin/templates/wagtailadmin/pages/revisions/index.html b/wagtail/admin/templates/wagtailadmin/pages/revisions/index.html deleted file mode 100644 index 6fc05a4e9f..0000000000 --- a/wagtail/admin/templates/wagtailadmin/pages/revisions/index.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "wagtailadmin/base.html" %} -{% load i18n %} - -{% block titletag %}{% blocktrans with title=page.get_admin_display_title %}Revisions of {{ title }}{% endblocktrans %}{% endblock %} - -{% block content %} - {% trans "Revisions of" as revisions_str %} - {% include "wagtailadmin/shared/header.html" with title=revisions_str subtitle=page.get_admin_display_title icon="doc-empty-inverse" %} - -
-
- {% include "wagtailadmin/pages/revisions/results.html" %} -
-
-{% endblock %} diff --git a/wagtail/admin/templates/wagtailadmin/pages/revisions/list.html b/wagtail/admin/templates/wagtailadmin/pages/revisions/list.html deleted file mode 100644 index 4c2ab6024b..0000000000 --- a/wagtail/admin/templates/wagtailadmin/pages/revisions/list.html +++ /dev/null @@ -1,40 +0,0 @@ -{% load i18n wagtailadmin_tags %} -{% load l10n %} - - - - - - - - - - - {% if revisions %} - {% page_permissions page as page_perms %} - {% for revision in revisions %} - - - - {% endfor %} - {% else %} - {% block no_results %}{% endblock %} - {% endif %} - -
- - {% trans 'Revision date' %} - -
-
- {{ revision.created_at }} - - {% trans 'by' context 'points to a user who created a revision' %}{{ revision.user }} - - {% if revision == page.get_latest_revision %}({% trans 'Current draft' %}){% endif %} - {% if revision == page.live_revision %}({% trans 'Live version' %}){% endif %} - {% if revision.approved_go_live_at %}({% trans 'Scheduled for' %} {{ revision.approved_go_live_at }}) {% endif %} -
- - {% include "wagtailadmin/pages/revisions/_actions.html" %} -

{% trans 'No revisions of this page exist' %}

diff --git a/wagtail/admin/templates/wagtailadmin/pages/revisions/results.html b/wagtail/admin/templates/wagtailadmin/pages/revisions/results.html deleted file mode 100644 index 5a5c426deb..0000000000 --- a/wagtail/admin/templates/wagtailadmin/pages/revisions/results.html +++ /dev/null @@ -1,9 +0,0 @@ -{% load i18n wagtailadmin_tags %} - -{% if revisions %} - {% include "wagtailadmin/pages/revisions/list.html" %} - - {% include "wagtailadmin/shared/pagination_nav.html" with items=revisions linkurl="wagtailadmin_pages:revisions_index" %} -{% else %} -

{% blocktrans %}No revision of this page exist{% endblocktrans %}

-{% endif %} diff --git a/wagtail/admin/tests/pages/test_revisions.py b/wagtail/admin/tests/pages/test_revisions.py index 6d7edb6906..5ae7dacd39 100644 --- a/wagtail/admin/tests/pages/test_revisions.py +++ b/wagtail/admin/tests/pages/test_revisions.py @@ -3,8 +3,6 @@ from django.contrib.auth import get_user_model from django.contrib.auth.models import Group, Permission from django.test import TestCase from django.urls import reverse -from django.utils import formats -from django.utils.dateparse import parse_date from freezegun import freeze_time from wagtail.admin.tests.pages.timestamps import local_datetime @@ -44,31 +42,8 @@ class TestRevisions(TestCase, WagtailTestUtils): response = self.client.get( reverse('wagtailadmin_pages:revisions_index', args=(self.christmas_event.id, )) ) - self.assertEqual(response.status_code, 200) - - self.assertContains(response, formats.localize(parse_date('2013-12-25'))) - last_christmas_preview_url = reverse( - 'wagtailadmin_pages:revisions_view', - args=(self.christmas_event.id, self.last_christmas_revision.id) - ) - last_christmas_revert_url = reverse( - 'wagtailadmin_pages:revisions_revert', - args=(self.christmas_event.id, self.last_christmas_revision.id) - ) - self.assertContains(response, last_christmas_preview_url) - self.assertContains(response, last_christmas_revert_url) - - self.assertContains(response, formats.localize(local_datetime(2014, 12, 25))) - this_christmas_preview_url = reverse( - 'wagtailadmin_pages:revisions_view', - args=(self.christmas_event.id, self.this_christmas_revision.id) - ) - this_christmas_revert_url = reverse( - 'wagtailadmin_pages:revisions_revert', - args=(self.christmas_event.id, self.this_christmas_revision.id) - ) - self.assertContains(response, this_christmas_preview_url) - self.assertContains(response, this_christmas_revert_url) + history_url = reverse('wagtailadmin_pages:history', args=(self.christmas_event.id, )) + self.assertRedirects(response, history_url) def request_preview_revision(self): last_christmas_preview_url = reverse( diff --git a/wagtail/admin/views/pages/revisions.py b/wagtail/admin/views/pages/revisions.py index e1eddfa40d..df66989353 100644 --- a/wagtail/admin/views/pages/revisions.py +++ b/wagtail/admin/views/pages/revisions.py @@ -1,6 +1,5 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import PermissionDenied -from django.core.paginator import Paginator from django.http import Http404 from django.shortcuts import get_object_or_404, redirect from django.template.loader import render_to_string @@ -16,26 +15,8 @@ from wagtail.admin.views.pages.utils import get_valid_next_url_from_request from wagtail.core.models import Page, UserPagePermissionsProxy -@user_passes_test(user_has_any_page_permission) def revisions_index(request, page_id): - page = get_object_or_404(Page, id=page_id).specific - - # Get page ordering - ordering = request.GET.get('ordering', '-created_at') - if ordering not in ['created_at', '-created_at', ]: - ordering = '-created_at' - - revisions = page.revisions.order_by(ordering) - - paginator = Paginator(revisions, per_page=20) - revisions = paginator.get_page(request.GET.get('p')) - - return TemplateResponse(request, 'wagtailadmin/pages/revisions/index.html', { - 'page': page, - 'ordering': ordering, - 'pagination_query_params': "ordering=%s" % ordering, - 'revisions': revisions, - }) + return redirect('wagtailadmin_pages:history', page_id) def revisions_revert(request, page_id, revision_id):