Skip to content

Commit

Permalink
[fc] Repository: plone.volto
Browse files Browse the repository at this point in the history 
Branch: refs/heads/main
Date: 2023-06-04T12:55:43+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.volto@0effb2a

Fix unchecked checkboxes in migrate_to_volto (#124)

Files changed:
M src/plone/volto/browser/migrate_to_volto.pt
Repository: plone.volto

Branch: refs/heads/main
Date: 2023-06-04T12:57:07+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.volto@c93f85f

add changenote

Files changed:
A news/124.bugfix
Repository: plone.volto

Branch: refs/heads/main
Date: 2023-06-07T07:26:47+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.volto@fd6d640

Change default values

Files changed:
M src/plone/volto/browser/migrate_to_volto.py
Repository: plone.volto

Branch: refs/heads/main
Date: 2023-06-07T08:50:07+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.volto@341a7b8

check checkboxes in tests

Files changed:
M src/plone/volto/tests/test_migrate_to_volto.py
Repository: plone.volto

Branch: refs/heads/main
Date: 2023-06-08T06:32:01+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.volto@1299639

revert fd6d640 and 341a7b8

Files changed:
M src/plone/volto/browser/migrate_to_volto.py
M src/plone/volto/tests/test_migrate_to_volto.py
Repository: plone.volto

Branch: refs/heads/main
Date: 2023-06-07T23:27:41-07:00
Author: David Glick (davisagli) <david@glicksoftware.com>
Commit: plone/plone.volto@2b0920d

Merge pull request #125 from plone/fix_checkboxes_in_migrate_to_volto

Fix unchecked checkboxes in migrate_to_volto

Files changed:
A news/124.bugfix
M src/plone/volto/browser/migrate_to_volto.pt
  • Loading branch information
@davisagli
davisagli committed Jun 8, 2023
1 parent 3c46def commit 1d28167
Showing 1 changed file with 80 additions and 19 deletions.
99 changes: 80 additions & 19 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,94 @@
Repository: plone.restapi
Repository: plone.volto


Branch: refs/heads/master
Date: 2023-06-06T22:25:08+02:00
Author: Timo Stollenwerk (tisto) <stollenwerk@kitconcept.com>
Commit: https://github.com/plone/plone.restapi/commit/6771f0656b7ab24fcab8ad14cc056f3f97e6b8ea
Branch: refs/heads/main
Date: 2023-06-04T12:55:43+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: https://github.com/plone/plone.volto/commit/0effb2a8991a5a679b094a6b4faef168bbaebb0c

Preparing release 8.40.0
Fix unchecked checkboxes in migrate_to_volto (#124)

Files changed:
M CHANGES.rst
M setup.py
D news/1464.feature
D news/1653.bugfix
M src/plone/volto/browser/migrate_to_volto.pt

b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 28d5ec9a9..ca01deefa 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -8,6 +8,21 @@ Changelog\n \n .. towncrier release notes start\n \n+8.40.0 (2023-06-06)\n+-------------------\n+\n+New features:\n+\n+\n+- Added `@site` and `@navroot` endpoints. @erral (#1464)\n+\n+\n+Bug fixes:\n+\n+\n+- Validate input to the `@querystring-search` service. Input which can\'t be processed now results in a 400 response instead of 500. @davisagli (#1653)\n+\n+\n 8.39.2 (2023-06-01)\n -------------------\n \ndiff --git a/news/1464.feature b/news/1464.feature\ndeleted file mode 100644\nindex 5e52088d8..000000000\n--- a/news/1464.feature\n+++ /dev/null\n@@ -1 +0,0 @@\n-Added `@site` and `@navroot` endpoints. @erral \ndiff --git a/news/1653.bugfix b/news/1653.bugfix\ndeleted file mode 100644\nindex 1ffb310b8..000000000\n--- a/news/1653.bugfix\n+++ /dev/null\n@@ -1 +0,0 @@\n-Validate input to the `@querystring-search` service. Input which can\'t be processed now results in a 400 response instead of 500. @davisagli\ndiff --git a/setup.py b/setup.py\nindex 7ac5d8375..6afbdf533 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -4,7 +4,7 @@\n import sys\n \n \n-version = "8.39.3.dev0"\n+version = "8.40.0"\n \n if sys.version_info.major == 2:\n raise ValueError(\n'
b'diff --git a/src/plone/volto/browser/migrate_to_volto.pt b/src/plone/volto/browser/migrate_to_volto.pt\nindex fe14a21..684298b 100644\n--- a/src/plone/volto/browser/migrate_to_volto.pt\n+++ b/src/plone/volto/browser/migrate_to_volto.pt\n@@ -55,6 +55,7 @@\n </p>\n \n <div class="form-check mb-3">\n+ <input name="migrate_folders:boolean:default" type="hidden" value="" />\n <input\n class="form-check-input"\n type="checkbox"\n@@ -68,6 +69,7 @@\n </div>\n \n <div class="form-check mb-3 ms-4">\n+ <input name="migrate_default_pages:boolean:default" type="hidden" value="" />\n <input\n class="form-check-input"\n type="checkbox"\n@@ -86,6 +88,7 @@\n </div>\n \n <div class="form-check mb-3">\n+ <input name="purge_richtext:boolean:default" type="hidden" value="" />\n <input\n class="form-check-input"\n type="checkbox"\n'

Repository: plone.restapi
Repository: plone.volto


Branch: refs/heads/master
Date: 2023-06-06T22:25:36+02:00
Author: Timo Stollenwerk (tisto) <stollenwerk@kitconcept.com>
Commit: https://github.com/plone/plone.restapi/commit/4a556e95962f4a03e7013a331e6e70ef9ae2bca6
Branch: refs/heads/main
Date: 2023-06-04T12:57:07+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: https://github.com/plone/plone.volto/commit/c93f85ffe5b2244cc02965b13e754ee62fb2676b

Back to development: 8.40.1
add changenote

Files changed:
M setup.py
A news/124.bugfix

b'diff --git a/setup.py b/setup.py\nindex 6afbdf533..7cdfc10ec 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -4,7 +4,7 @@\n import sys\n \n \n-version = "8.40.0"\n+version = "8.40.1.dev0"\n \n if sys.version_info.major == 2:\n raise ValueError(\n'
b'diff --git a/news/124.bugfix b/news/124.bugfix\nnew file mode 100644\nindex 0000000..57ad10a\n--- /dev/null\n+++ b/news/124.bugfix\n@@ -0,0 +1,2 @@\n+Fix value of unchecked checkboxes in migrate_to_volto.\n+[pbauer]\n\\ No newline at end of file\n'

Repository: plone.volto


Branch: refs/heads/main
Date: 2023-06-07T07:26:47+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: https://github.com/plone/plone.volto/commit/fd6d6401ea10f63565cab3127b617aff3b956ca6

Change default values

Files changed:
M src/plone/volto/browser/migrate_to_volto.py

b'diff --git a/src/plone/volto/browser/migrate_to_volto.py b/src/plone/volto/browser/migrate_to_volto.py\nindex 8eba43b..4a7c110 100644\n--- a/src/plone/volto/browser/migrate_to_volto.py\n+++ b/src/plone/volto/browser/migrate_to_volto.py\n@@ -37,9 +37,9 @@ class MigrateToVolto(BrowserView):\n def __call__(self):\n request = self.request\n self.service_url = request.get("service_url", "http://localhost:5000/html")\n- self.migrate_folders = request.get("migrate_folders", True)\n- self.migrate_default_pages = request.get("migrate_default_pages", True)\n- self.purge_richtext = request.get("purge_richtext", True)\n+ self.migrate_folders = request.get("migrate_folders", False)\n+ self.migrate_default_pages = request.get("migrate_default_pages", False)\n+ self.purge_richtext = request.get("purge_richtext", False)\n # We can still use outdated draftjs by setting slate to False on the request\n self.slate = request.get("slate", True)\n \n'

Repository: plone.volto


Branch: refs/heads/main
Date: 2023-06-07T08:50:07+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: https://github.com/plone/plone.volto/commit/341a7b85974a461d24523085343c5f6b357055f6

check checkboxes in tests

Files changed:
M src/plone/volto/tests/test_migrate_to_volto.py

b'diff --git a/src/plone/volto/tests/test_migrate_to_volto.py b/src/plone/volto/tests/test_migrate_to_volto.py\nindex 0fe7fe5..3739a03 100644\n--- a/src/plone/volto/tests/test_migrate_to_volto.py\n+++ b/src/plone/volto/tests/test_migrate_to_volto.py\n@@ -40,6 +40,10 @@ def test_plonevolto_is_installed(self):\n self.assertFalse(installer.is_product_installed("plone.volto"))\n \n view = self.portal.restrictedTraverse("@@migrate_to_volto")\n+ # check checkboxes\n+ self.request.form["migrate_folders"] = True\n+ self.request.form["migrate_default_pages"] = True\n+ self.request.form["purge_richtext"] = True\n self.request.form["form.submitted"] = True\n view()\n \n@@ -66,6 +70,10 @@ def test_items_are_migrated_to_folderish(self):\n )\n \n view = self.portal.restrictedTraverse("@@migrate_to_volto")\n+ # check checkboxes\n+ self.request.form["migrate_folders"] = True\n+ self.request.form["migrate_default_pages"] = True\n+ self.request.form["purge_richtext"] = True\n self.request.form["form.submitted"] = True\n view()\n \n@@ -105,6 +113,9 @@ def test_folders_are_migrated(self):\n self.assertEqual(self.portal["folder1"].portal_type, "Folder")\n \n view = self.portal.restrictedTraverse("@@migrate_to_volto")\n+ self.request.form["migrate_folders"] = True\n+ self.request.form["migrate_default_pages"] = True\n+ self.request.form["purge_richtext"] = True\n self.request.form["form.submitted"] = True\n view()\n \n@@ -134,6 +145,10 @@ def test_collections_are_migrated(self):\n self.assertEqual(self.portal["collection"].portal_type, "Collection")\n \n view = self.portal.restrictedTraverse("@@migrate_to_volto")\n+ # check checkboxes\n+ self.request.form["migrate_folders"] = True\n+ self.request.form["migrate_default_pages"] = True\n+ self.request.form["purge_richtext"] = True\n self.request.form["form.submitted"] = True\n view()\n \n@@ -180,6 +195,10 @@ def test_default_pages_are_migrated(self):\n folder.setDefaultPage("doc")\n \n view = self.portal.restrictedTraverse("@@migrate_to_volto")\n+ # check checkboxes\n+ self.request.form["migrate_folders"] = True\n+ self.request.form["migrate_default_pages"] = True\n+ self.request.form["purge_richtext"] = True\n self.request.form["form.submitted"] = True\n view()\n \n@@ -238,6 +257,10 @@ def test_default_page_collections_are_migrated(self):\n self.assertEqual(len(collection.results()), 2)\n \n view = self.portal.restrictedTraverse("@@migrate_to_volto")\n+ # check checkboxes\n+ self.request.form["migrate_folders"] = True\n+ self.request.form["migrate_default_pages"] = True\n+ self.request.form["purge_richtext"] = True\n self.request.form["form.submitted"] = True\n view()\n \n@@ -291,6 +314,10 @@ def test_default_page_news_are_not_migrated(self):\n self.assertIn("news", folder.keys())\n \n view = self.portal.restrictedTraverse("@@migrate_to_volto")\n+ # check checkboxes\n+ self.request.form["migrate_folders"] = True\n+ self.request.form["migrate_default_pages"] = True\n+ self.request.form["purge_richtext"] = True\n self.request.form["form.submitted"] = True\n view()\n \n@@ -329,6 +356,9 @@ def test_richtext_is_migrated(self):\n self.assertTrue(isinstance(doc.text, RichTextValue))\n \n view = self.portal.restrictedTraverse("@@migrate_to_volto")\n+ self.request.form["migrate_folders"] = True\n+ self.request.form["migrate_default_pages"] = True\n+ self.request.form["purge_richtext"] = True\n self.request.form["form.submitted"] = True\n view()\n \n'

Repository: plone.volto


Branch: refs/heads/main
Date: 2023-06-08T06:32:01+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: https://github.com/plone/plone.volto/commit/1299639b30df8132075de062e6e3c2cd8e22e19a

revert fd6d640 and 341a7b8

Files changed:
M src/plone/volto/browser/migrate_to_volto.py
M src/plone/volto/tests/test_migrate_to_volto.py

b'diff --git a/src/plone/volto/browser/migrate_to_volto.py b/src/plone/volto/browser/migrate_to_volto.py\nindex 4a7c110..8eba43b 100644\n--- a/src/plone/volto/browser/migrate_to_volto.py\n+++ b/src/plone/volto/browser/migrate_to_volto.py\n@@ -37,9 +37,9 @@ class MigrateToVolto(BrowserView):\n def __call__(self):\n request = self.request\n self.service_url = request.get("service_url", "http://localhost:5000/html")\n- self.migrate_folders = request.get("migrate_folders", False)\n- self.migrate_default_pages = request.get("migrate_default_pages", False)\n- self.purge_richtext = request.get("purge_richtext", False)\n+ self.migrate_folders = request.get("migrate_folders", True)\n+ self.migrate_default_pages = request.get("migrate_default_pages", True)\n+ self.purge_richtext = request.get("purge_richtext", True)\n # We can still use outdated draftjs by setting slate to False on the request\n self.slate = request.get("slate", True)\n \ndiff --git a/src/plone/volto/tests/test_migrate_to_volto.py b/src/plone/volto/tests/test_migrate_to_volto.py\nindex 3739a03..0fe7fe5 100644\n--- a/src/plone/volto/tests/test_migrate_to_volto.py\n+++ b/src/plone/volto/tests/test_migrate_to_volto.py\n@@ -40,10 +40,6 @@ def test_plonevolto_is_installed(self):\n self.assertFalse(installer.is_product_installed("plone.volto"))\n \n view = self.portal.restrictedTraverse("@@migrate_to_volto")\n- # check checkboxes\n- self.request.form["migrate_folders"] = True\n- self.request.form["migrate_default_pages"] = True\n- self.request.form["purge_richtext"] = True\n self.request.form["form.submitted"] = True\n view()\n \n@@ -70,10 +66,6 @@ def test_items_are_migrated_to_folderish(self):\n )\n \n view = self.portal.restrictedTraverse("@@migrate_to_volto")\n- # check checkboxes\n- self.request.form["migrate_folders"] = True\n- self.request.form["migrate_default_pages"] = True\n- self.request.form["purge_richtext"] = True\n self.request.form["form.submitted"] = True\n view()\n \n@@ -113,9 +105,6 @@ def test_folders_are_migrated(self):\n self.assertEqual(self.portal["folder1"].portal_type, "Folder")\n \n view = self.portal.restrictedTraverse("@@migrate_to_volto")\n- self.request.form["migrate_folders"] = True\n- self.request.form["migrate_default_pages"] = True\n- self.request.form["purge_richtext"] = True\n self.request.form["form.submitted"] = True\n view()\n \n@@ -145,10 +134,6 @@ def test_collections_are_migrated(self):\n self.assertEqual(self.portal["collection"].portal_type, "Collection")\n \n view = self.portal.restrictedTraverse("@@migrate_to_volto")\n- # check checkboxes\n- self.request.form["migrate_folders"] = True\n- self.request.form["migrate_default_pages"] = True\n- self.request.form["purge_richtext"] = True\n self.request.form["form.submitted"] = True\n view()\n \n@@ -195,10 +180,6 @@ def test_default_pages_are_migrated(self):\n folder.setDefaultPage("doc")\n \n view = self.portal.restrictedTraverse("@@migrate_to_volto")\n- # check checkboxes\n- self.request.form["migrate_folders"] = True\n- self.request.form["migrate_default_pages"] = True\n- self.request.form["purge_richtext"] = True\n self.request.form["form.submitted"] = True\n view()\n \n@@ -257,10 +238,6 @@ def test_default_page_collections_are_migrated(self):\n self.assertEqual(len(collection.results()), 2)\n \n view = self.portal.restrictedTraverse("@@migrate_to_volto")\n- # check checkboxes\n- self.request.form["migrate_folders"] = True\n- self.request.form["migrate_default_pages"] = True\n- self.request.form["purge_richtext"] = True\n self.request.form["form.submitted"] = True\n view()\n \n@@ -314,10 +291,6 @@ def test_default_page_news_are_not_migrated(self):\n self.assertIn("news", folder.keys())\n \n view = self.portal.restrictedTraverse("@@migrate_to_volto")\n- # check checkboxes\n- self.request.form["migrate_folders"] = True\n- self.request.form["migrate_default_pages"] = True\n- self.request.form["purge_richtext"] = True\n self.request.form["form.submitted"] = True\n view()\n \n@@ -356,9 +329,6 @@ def test_richtext_is_migrated(self):\n self.assertTrue(isinstance(doc.text, RichTextValue))\n \n view = self.portal.restrictedTraverse("@@migrate_to_volto")\n- self.request.form["migrate_folders"] = True\n- self.request.form["migrate_default_pages"] = True\n- self.request.form["purge_richtext"] = True\n self.request.form["form.submitted"] = True\n view()\n \n'

Repository: plone.volto


Branch: refs/heads/main
Date: 2023-06-07T23:27:41-07:00
Author: David Glick (davisagli) <david@glicksoftware.com>
Commit: https://github.com/plone/plone.volto/commit/2b0920da4dbe9e3940714581116972d2e074fe5e

Merge pull request #125 from plone/fix_checkboxes_in_migrate_to_volto

Fix unchecked checkboxes in migrate_to_volto

Files changed:
A news/124.bugfix
M src/plone/volto/browser/migrate_to_volto.pt

b'diff --git a/news/124.bugfix b/news/124.bugfix\nnew file mode 100644\nindex 0000000..57ad10a\n--- /dev/null\n+++ b/news/124.bugfix\n@@ -0,0 +1,2 @@\n+Fix value of unchecked checkboxes in migrate_to_volto.\n+[pbauer]\n\\ No newline at end of file\ndiff --git a/src/plone/volto/browser/migrate_to_volto.pt b/src/plone/volto/browser/migrate_to_volto.pt\nindex fe14a21..684298b 100644\n--- a/src/plone/volto/browser/migrate_to_volto.pt\n+++ b/src/plone/volto/browser/migrate_to_volto.pt\n@@ -55,6 +55,7 @@\n </p>\n \n <div class="form-check mb-3">\n+ <input name="migrate_folders:boolean:default" type="hidden" value="" />\n <input\n class="form-check-input"\n type="checkbox"\n@@ -68,6 +69,7 @@\n </div>\n \n <div class="form-check mb-3 ms-4">\n+ <input name="migrate_default_pages:boolean:default" type="hidden" value="" />\n <input\n class="form-check-input"\n type="checkbox"\n@@ -86,6 +88,7 @@\n </div>\n \n <div class="form-check mb-3">\n+ <input name="purge_richtext:boolean:default" type="hidden" value="" />\n <input\n class="form-check-input"\n type="checkbox"\n'

0 comments on commit 1d28167

Please sign in to comment.