Merge branch 'release/3.1.0'

Author: marteinn

.github/workflows/main.yml

@@ -7,10 +7,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         wagtail-version:
         - 5.2
-        - 6.0
+        - 6.2
+        - 6.3
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}

CHANGELOG.md

@@ -6,6 +6,21 @@
 ### Fixed
 ### Removed
 
+## [3.1.0] - 2025-02-01
+### Added
+- Add Wagtail 6.2 and 6.3 support (@marteinn)
+- Add python 3.13 support (@marteinn)
+
+### Changed
+- Set Wagtail 5.2 as min version (@marteinn)
+
+### Fixed
+- Add form validation before moving page (@marteinn)
+
+### Removed
+- Drop EOL python 3.8 (@marteinn)
+- Drop Django 3.2 support (@marteinn)
+
 ## [3.0.0] - 2024-02-10
 ### Added
 - Add Wagtail 6 support (@marteinn)

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12-slim
+FROM python:3.13-slim
 
 WORKDIR /srv
 

docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3"
 services:
   web: 
     build: "./"
@@ -17,7 +16,7 @@ services:
     environment:
       - DATABASE_HOST=db
   db:
-    image: postgis/postgis:12-2.5
+    image: postgis/postgis:13-3.4
     expose:
       - "5432"
     environment:

setup.py

@@ -19,7 +19,7 @@
     author="Andreas Bernacca",
     author_email="ante.bernacca@gmail.com",
     install_requires=[
-        "wagtail>=4.1",
+        "wagtail>=5.2",
         "wagtail-modeladmin",
     ],
     extras_require={
@@ -37,15 +37,15 @@
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Framework :: Django",
-        "Framework :: Django :: 3.2",
         "Framework :: Django :: 4.2",
         "Framework :: Django :: 5.0",
+        "Framework :: Django :: 5.1",
         "Framework :: Wagtail",
         "Framework :: Wagtail :: 5",
         "Framework :: Wagtail :: 6",

tests/test_admin.py

@@ -309,6 +309,31 @@ def test_restoring_page_custom_move_to(self):
 
         self.assertEqual(TrashCan.objects.count(), 0)
 
+    def test_restoring_page_custom_move_to_without_id_returns_validation_error(self):
+        from wagtail_trash.wagtail_hooks import urlconf_time
+
+        root_page = Page.objects.get(url_path="/")
+
+        top = Page(title="1p", has_unpublished_changes=False, live=True)
+        root_page.add_child(instance=top)
+
+        sub_page = Page(title="1p 1u", has_unpublished_changes=True, live=False)
+        top.add_child(instance=sub_page)
+
+        with self.register_hook("before_delete_page", trash_delete):
+            delete_url = reverse("wagtailadmin_pages:delete", args=(sub_page.id,))
+            self.client.post(delete_url)
+
+        sub_page.refresh_from_db()
+
+        with self.register_hook("register_admin_urls", urlconf_time):
+            restore_url = reverse(
+                "wagtail_trash_move",
+                args=(sub_page.id,),
+            )
+            response = self.client.post(restore_url, {"move_page": ""})
+            self.assertIn("This field is required", str(response.content))
+
     def test_move_view_renders(self):
         from wagtail_trash.wagtail_hooks import urlconf_time
 

wagtail_trash/version.py

@@ -1,2 +1,2 @@
-version_info = (3, 0, 0)
+version_info = (3, 1, 0)
 version = ".".join(map(str, version_info))

wagtail_trash/views.py

@@ -112,6 +112,16 @@ def trash_delete(request, page):
 
 def trash_move(request, page_id):
     if request.method == "POST":
+        form = MoveForm(data=request.POST)
+        if not form.is_valid():
+            return render(
+                request,
+                "wagtail_trash/move.html",
+                {
+                    "form": form,
+                },
+            )
+
         rb = TrashCan.objects.get(page_id=page_id)
         move_to_page = Page.objects.get(pk=request.POST.get("move_page"))
         restore_and_move_page(rb, move_to_page, request)