From 10b67a4e62ad7d4e2075dc32193f1c43a5f8d9f2 Mon Sep 17 00:00:00 2001
From: Ryan Heuser <ryan.heuser@princeton.edu>
Date: Wed, 18 Oct 2023 13:57:20 -0400
Subject: [PATCH] to 4.0

---
 mep/pages/models.py | 18 +++++++++---------
 requirements.txt    |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mep/pages/models.py b/mep/pages/models.py
index 3f1396f4..88854bc7 100644
--- a/mep/pages/models.py
+++ b/mep/pages/models.py
@@ -6,14 +6,14 @@
 from django.template.defaultfilters import striptags, truncatechars_html
 from django.utils.functional import cached_property
 from django.utils.text import slugify
-from wagtail.admin.panels import FieldPanel, StreamFieldPanel
+from wagtail.admin.panels import FieldPanel
 from wagtail import blocks
 from wagtail.fields import RichTextField, StreamField
 from wagtail.models import Page
 from wagtail.documents.blocks import DocumentChooserBlock
 from wagtail.embeds.blocks import EmbedBlock
 from wagtail.images.blocks import ImageChooserBlock
-from wagtail.images.edit_handlers import ImageChooserPanel
+# from wagtail.images.edit_handlers import ImageChooserPanel
 from wagtail.snippets.blocks import SnippetChooserBlock
 from wagtail.snippets.models import register_snippet
 
@@ -137,7 +137,7 @@ class HomePage(Page):
     body = StreamField(BodyContentBlock)
 
     content_panels = Page.content_panels + [
-        StreamFieldPanel("body"),
+        FieldPanel("body"),
     ]
 
     class Meta:
@@ -184,9 +184,9 @@ class LandingPage(RdfPageMixin, Page):
     )
 
     content_panels = Page.content_panels + [
-        ImageChooserPanel("header_image"),
+        FieldPanel("header_image"),
         FieldPanel("tagline"),
-        StreamFieldPanel("body"),
+        FieldPanel("body"),
     ]
 
     class Meta:
@@ -421,10 +421,10 @@ class BasePage(RdfPageMixin, Page, PagePreviewDescriptionMixin):
 
     content_panels = Page.content_panels + [
         FieldPanel("description"),
-        StreamFieldPanel("authors"),
-        StreamFieldPanel("editors"),
-        ImageChooserPanel("featured_image"),
-        StreamFieldPanel("body"),
+        FieldPanel("authors"),
+        FieldPanel("editors"),
+        FieldPanel("featured_image"),
+        FieldPanel("body"),
     ]
 
     class Meta:
diff --git a/requirements.txt b/requirements.txt
index f7884331..7b5db3db 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ pucas>=0.8
 eulxml>=1.1.3
 viapy>=0.2
 # wagtail>=2.16,<2.17
-wagtail>=3.0,<3.1
+wagtail>=4.0,<4.1
 # pin for js error with dal>3.5; see https://github.com/Princeton-CDH/mep-django/issues/716
 django-autocomplete-light>=3.9
 python-dateutil