diff --git a/CHANGELOG.txt b/CHANGELOG.txt index de325290df..89a5f12798 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -13,6 +13,7 @@ Changelog * `send_mail` logic has been moved from `AbstractEmailForm.process_form_submission` into `AbstractEmailForm.send_mail`. Now it's easier to override this logic (Tim Leguijt) * Added `before_create_page`, `before_edit_page`, `before_delete_page` hooks (Karl Hobley) * Updated font sizes and colours to improve legibility of admin menu and buttons (Stein Strindhaug) + * Added pagination to "choose destination" view when moving pages (Nick Smith, Žan Anderle) * Fix: Migrations for wagtailcore and project template are now reversible (Benjamin Bach) * Fix: The default image format label text ('Full width', 'Left-aligned', 'Right-aligned') is now localised (Mikalai Radchuk) * Fix: Text on the front-end 'password required' form is now marked for translation (Janneke Janssen) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 6c312bfa7d..a774719478 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -168,6 +168,7 @@ Contributors * Jayden Smith * emg36 * Stein Strindhaug +* Žan Anderle Translators =========== diff --git a/docs/releases/1.7.rst b/docs/releases/1.7.rst index d4ee0cba73..91e7d3bfd1 100644 --- a/docs/releases/1.7.rst +++ b/docs/releases/1.7.rst @@ -43,6 +43,7 @@ Minor features * ``send_mail`` logic has been moved from ``AbstractEmailForm.process_form_submission`` into ``AbstractEmailForm.send_mail``. Now it's easier to override this logic (Tim Leguijt) * Added ``before_create_page``, ``before_edit_page``, ``before_delete_page`` hooks (Karl Hobley) * Updated font sizes and colours to improve legibility of admin menu and buttons (Stein Strindhaug) + * Added pagination to "choose destination" view when moving pages (Nick Smith, Žan Anderle) Bug fixes diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/pages/move_choose_destination.html b/wagtail/wagtailadmin/templates/wagtailadmin/pages/move_choose_destination.html index 2cbfbf2f4a..75834c1aa8 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/pages/move_choose_destination.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/pages/move_choose_destination.html @@ -1,5 +1,5 @@ {% extends "wagtailadmin/base.html" %} -{% load i18n %} +{% load i18n wagtailadmin_tags %} {% block titletag %}{% blocktrans with title=page_to_move.title %}Select a new parent page for {{ title }}{% endblocktrans %}{% endblock %} {% block content %}
@@ -8,5 +8,7 @@
{% include "wagtailadmin/pages/listing/_list_move.html" with pages=child_pages parent_page=viewed_page %} + {% url 'wagtailadmin_pages:move_choose_destination' page_to_move.id viewed_page.id as pagination_base_url %} + {% paginate child_pages base_url=pagination_base_url %}
{% endblock %} diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index ca745cc4a1..24b311b4ce 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -714,6 +714,9 @@ def move_choose_destination(request, page_to_move_id, viewed_page_id=None): child_pages.append(target) + # Pagination + paginator, child_pages = paginate(request, child_pages, per_page=50) + return render(request, 'wagtailadmin/pages/move_choose_destination.html', { 'page_to_move': page_to_move, 'viewed_page': viewed_page,