Merge branch 'main' into add-block-types-index-zcatalog

CHANGES.rst

@@ -8,6 +8,18 @@ Changelog
 
 .. towncrier release notes start
 
+4.0.9 (2023-06-22)
+------------------
+
+Bug fixes:
+
+
+- Let the migration-form @@migrate_to_volto transform richtext to slate-blocks by default.
+  [pbauer] (#122)
+- Fix value of unchecked checkboxes in migrate_to_volto.
+  [pbauer] (#124)
+
+
 4.0.8 (2023-03-23)
 ------------------
 

setup.py

@@ -25,7 +25,7 @@ def readfile(name):
 
 setup(
     name="plone.volto",
-    version="4.0.9.dev0",
+    version="4.0.10.dev0",
     description="Volto integration add-on for Plone",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/

src/plone/volto/browser/migrate_to_volto.pt

@@ -55,6 +55,7 @@
         </p>
 
         <div class="form-check mb-3">
+            <input name="migrate_folders:boolean:default" type="hidden" value="" />
             <input
                 class="form-check-input"
                 type="checkbox"
@@ -68,6 +69,7 @@
         </div>
 
         <div class="form-check mb-3 ms-4">
+            <input name="migrate_default_pages:boolean:default" type="hidden" value="" />
             <input
                 class="form-check-input"
                 type="checkbox"
@@ -86,6 +88,7 @@
         </div>
 
         <div class="form-check mb-3">
+            <input name="purge_richtext:boolean:default" type="hidden" value="" />
             <input
                 class="form-check-input"
                 type="checkbox"

src/plone/volto/browser/migrate_to_volto.py

@@ -40,8 +40,8 @@ def __call__(self):
         self.migrate_folders = request.get("migrate_folders", True)
         self.migrate_default_pages = request.get("migrate_default_pages", True)
         self.purge_richtext = request.get("purge_richtext", True)
-        # We still use draftjs at the moment
-        self.slate = request.get("slate", False)
+        # We can still use outdated draftjs by setting slate to False on the request
+        self.slate = request.get("slate", True)
 
         if not self.request.form.get("form.submitted", False):
             return self.index()

src/plone/volto/tests/test_migrate_to_volto.py

@@ -330,7 +330,6 @@ def test_richtext_is_migrated(self):
 
         view = self.portal.restrictedTraverse("@@migrate_to_volto")
         self.request.form["form.submitted"] = True
-        self.request.form["slate"] = True
         view()
 
         doc = self.portal["doc"]