Upgrade to Wagtail 5.1 (#439)

bakerydemo/base/fixtures/bakerydemo.json

@@ -1774,7 +1774,7 @@
     "fields": {
       "group": ["Moderators"],
       "page": 1,
-      "permission_type": "add"
+      "permission": ["add_page", "wagtailcore", "page"]
     }
   },
   {
@@ -1783,7 +1783,7 @@
     "fields": {
       "group": ["Moderators"],
       "page": 1,
-      "permission_type": "edit"
+      "permission": ["change_page", "wagtailcore", "page"]
     }
   },
   {
@@ -1792,7 +1792,7 @@
     "fields": {
       "group": ["Moderators"],
       "page": 1,
-      "permission_type": "publish"
+      "permission": ["publish_page", "wagtailcore", "page"]
     }
   },
   {
@@ -1801,7 +1801,7 @@
     "fields": {
       "group": ["Editors"],
       "page": 1,
-      "permission_type": "add"
+      "permission": ["add_page", "wagtailcore", "page"]
     }
   },
   {
@@ -1810,7 +1810,7 @@
     "fields": {
       "group": ["Editors"],
       "page": 1,
-      "permission_type": "edit"
+      "permission": ["change_page", "wagtailcore", "page"]
     }
   },
   {
@@ -1819,7 +1819,7 @@
     "fields": {
       "group": ["Moderators"],
       "page": 1,
-      "permission_type": "lock"
+      "permission": ["lock_page", "wagtailcore", "page"]
     }
   },
   {
@@ -1828,7 +1828,7 @@
     "fields": {
       "group": ["Moderators"],
       "page": 1,
-      "permission_type": "unlock"
+      "permission": ["unlock_page", "wagtailcore", "page"]
     }
   },
   {

bakerydemo/base/wagtail_hooks.py

@@ -1,12 +1,8 @@
 from wagtail import hooks
 from wagtail.admin.userbar import AccessibilityItem
-from wagtail.contrib.modeladmin.options import (
-    ModelAdmin,
-    ModelAdminGroup,
-    modeladmin_register,
-)
 from wagtail.snippets.models import register_snippet
 from wagtail.snippets.views.snippets import SnippetViewSet, SnippetViewSetGroup
+from wagtail_modeladmin.options import ModelAdmin, ModelAdminGroup, modeladmin_register
 
 from bakerydemo.base.models import FooterText, Person
 from bakerydemo.breads.models import BreadIngredient, BreadType, Country

bakerydemo/settings/base.py

@@ -58,7 +58,6 @@ INSTALLED_APPS = [
     "wagtail.contrib.routable_page",
     "wagtail.contrib.table_block",
     "wagtail.contrib.typed_table_block",
-    "wagtail.contrib.modeladmin",
     "wagtail.contrib.search_promotions",
     "wagtail.contrib.settings",
     "wagtail.contrib.simple_translation",
@@ -67,6 +66,7 @@ INSTALLED_APPS = [
     "rest_framework",
     "modelcluster",
     "taggit",
+    "wagtail_modeladmin",
     "wagtailfontawesomesvg",
     "debug_toolbar",
     "django_extensions",

requirements/base.txt

@@ -1,6 +1,7 @@
 Django>=4.2,<4.3
 django-dotenv==1.4.1
-wagtail>=5,<5.1
+wagtail>=5.1,<5.2
+wagtail-modeladmin>=1,<2
 wagtail-font-awesome-svg>=0.0.3,<1
 django-debug-toolbar>=3.2,<4
 django-extensions==3.2.1