diff --git a/last_commit.txt b/last_commit.txt index fa20408d67..cf6d706066 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,55 +1,54 @@ -Repository: plone.base +Repository: plone.app.upgrade -Branch: refs/heads/main -Date: 2024-06-18T18:28:53+02:00 -Author: Johannes Raggam (thet) -Commit: https://github.com/plone/plone.base/commit/656448029da88abbb2ecfebc3b39c3254c922030 +Branch: refs/heads/master +Date: 2024-06-18T14:09:26+02:00 +Author: Manuel Reinhardt (reinhardt) +Commit: https://github.com/plone/plone.app.upgrade/commit/332b770b348766dd7f2bcdd42baab86428b7bbf2 -Mockup TinyMCE settings: Remove deprecated AtD plugin settings. +Add upgrade step that removes AtD settings + +See https://github.com/plone/Products.CMFPlone/pull/3765 Files changed: -A news/33-1.bugfix -M src/plone/base/interfaces/controlpanel.py +A plone/app/upgrade/v61/profiles.zcml +A plone/app/upgrade/v61/profiles/to6103/registry.xml +M plone/app/upgrade/v61/configure.zcml -b'diff --git a/news/33-1.bugfix b/news/33-1.bugfix\nnew file mode 100644\nindex 0000000..64cdb7b\n--- /dev/null\n+++ b/news/33-1.bugfix\n@@ -0,0 +1 @@\n+Mockup TinyMCE settings: Remove deprecated AtD plugin settings.\ndiff --git a/src/plone/base/interfaces/controlpanel.py b/src/plone/base/interfaces/controlpanel.py\nindex 7f57588..5d1f501 100644\n--- a/src/plone/base/interfaces/controlpanel.py\n+++ b/src/plone/base/interfaces/controlpanel.py\n@@ -698,75 +698,6 @@ class ITinyMCEPluginSchema(Interface):\n class ITinyMCESpellCheckerSchema(Interface):\n """This interface defines the libraries properties."""\n \n- libraries_spellchecker_choice = schema.Choice(\n- title=_("Spellchecker plugin to use"),\n- description=_("This option allows you to choose the spellchecker for TinyMCE."),\n- missing_value=set(),\n- vocabulary=SimpleVocabulary(\n- [\n- SimpleTerm("browser", "browser", _("Default browser spellchecker")),\n- SimpleTerm("AtD", "AtD", _("After the deadline (FLOSS)")),\n- ]\n- ),\n- default="browser",\n- required=False,\n- )\n-\n- libraries_atd_ignore_strings = schema.List(\n- title=_("AtD ignore strings"),\n- description=_(\n- "label_atd_ignore_strings",\n- default=\'A list of strings which the "After the Deadline" \'\n- "spellchecker should ignore. "\n- "Note: This option is only applicable when the "\n- "appropriate spellchecker has been chosen above.",\n- ),\n- default=["Zope", "Plone", "TinyMCE"],\n- value_type=schema.TextLine(),\n- missing_value=[],\n- required=False,\n- )\n-\n- libraries_atd_show_types = schema.List(\n- title=_("AtD error types to show"),\n- description=_(\n- "help_atderrortypes_to_show",\n- default="A list of error types which the "\n- \'"After the Deadline" spellchecker should check for. \'\n- "By default, all the available error type will be "\n- "listed here.",\n- ),\n- value_type=schema.TextLine(),\n- default=[\n- "Bias Language",\n- "Cliches",\n- "Complex Expression",\n- "Diacritical Marks",\n- "Double Negatives",\n- "Hidden Verbs",\n- "Jargon Language",\n- "Passive voice",\n- "Phrases to Avoid",\n- "Redundant Expression",\n- ],\n- missing_value=[],\n- required=False,\n- )\n-\n- libraries_atd_service_url = schema.TextLine(\n- title=_("AtD service URL"),\n- description=_(\n- "help_atd_service_url",\n- default=\'The URL of the "After the Deadline" grammar and spell \'\n- "checking server. "\n- "The default value is the public server, "\n- "but ideally you should download and install your own "\n- "and specify its address here.",\n- ),\n- required=True,\n- default="service.afterthedeadline.com",\n- )\n-\n \n class ITinyMCEResourceTypesSchema(Interface):\n """This interface defines the resource types properties."""\n' +b'diff --git a/plone/app/upgrade/v61/configure.zcml b/plone/app/upgrade/v61/configure.zcml\nindex 53a58156..2512c3f2 100644\n--- a/plone/app/upgrade/v61/configure.zcml\n+++ b/plone/app/upgrade/v61/configure.zcml\n@@ -4,6 +4,8 @@\n i18n_domain="plone"\n >\n \n+ \n+\n \n+\n+ \n \n \n \ndiff --git a/plone/app/upgrade/v61/profiles.zcml b/plone/app/upgrade/v61/profiles.zcml\nnew file mode 100644\nindex 00000000..1dd84f37\n--- /dev/null\n+++ b/plone/app/upgrade/v61/profiles.zcml\n@@ -0,0 +1,14 @@\n+\n+\n+ \n+\n+\ndiff --git a/plone/app/upgrade/v61/profiles/to6103/registry.xml b/plone/app/upgrade/v61/profiles/to6103/registry.xml\nnew file mode 100644\nindex 00000000..3cf11181\n--- /dev/null\n+++ b/plone/app/upgrade/v61/profiles/to6103/registry.xml\n@@ -0,0 +1,7 @@\n+\n+\n+ \n+ \n+ \n+ \n+\n' -Repository: plone.base +Repository: plone.app.upgrade -Branch: refs/heads/main -Date: 2024-06-18T18:28:53+02:00 -Author: Johannes Raggam (thet) -Commit: https://github.com/plone/plone.base/commit/d2323fd6be9fa572909d5c3864c9e1904466f8d2 +Branch: refs/heads/master +Date: 2024-06-18T18:30:16+02:00 +Author: Maurits van Rees (mauritsvanrees) +Commit: https://github.com/plone/plone.app.upgrade/commit/d977aebb4b96cb82b7dd6855a2968b44a7f236ca -Mockup TinyMCE settings: Remove unused AtD related views and interfaces. +Hide plone.app.upgrade.v61 from products. Files changed: -A news/33-2.bugfix -M src/plone/base/interfaces/__init__.py -M src/plone/base/interfaces/controlpanel.py -D src/plone/base/interfaces/atd.py +M plone/app/upgrade/__init__.py -b'diff --git a/news/33-2.bugfix b/news/33-2.bugfix\nnew file mode 100644\nindex 0000000..31b4172\n--- /dev/null\n+++ b/news/33-2.bugfix\n@@ -0,0 +1 @@\n+Mockup TinyMCE settings: Remove unused AtD related views and interfaces.\ndiff --git a/src/plone/base/interfaces/__init__.py b/src/plone/base/interfaces/__init__.py\nindex 6c60588..6ffd695 100644\n--- a/src/plone/base/interfaces/__init__.py\n+++ b/src/plone/base/interfaces/__init__.py\n@@ -27,7 +27,6 @@\n from .controlpanel import ITinyMCEPluginSchema\n from .controlpanel import ITinyMCEResourceTypesSchema\n from .controlpanel import ITinyMCESchema\n-from .controlpanel import ITinyMCESpellCheckerSchema\n from .controlpanel import ITypesSchema\n from .controlpanel import IUserGroupsSettingsSchema\n from .events import IConfigurationChangedEvent\ndiff --git a/src/plone/base/interfaces/atd.py b/src/plone/base/interfaces/atd.py\ndeleted file mode 100644\nindex 1fe9ebc..0000000\n--- a/src/plone/base/interfaces/atd.py\n+++ /dev/null\n@@ -1,10 +0,0 @@\n-from zope.interface import Interface\n-\n-\n-class IATDProxyView(Interface):\n- """Proxy view for the \'After the Deadline" spellchecker"""\n-\n- def checkDocument(self):\n- """Proxy for the AtD service\'s checkDocument function\n- See http://www.afterthedeadline.com/api.slp for more info.\n- """\ndiff --git a/src/plone/base/interfaces/controlpanel.py b/src/plone/base/interfaces/controlpanel.py\nindex 5d1f501..4ba876f 100644\n--- a/src/plone/base/interfaces/controlpanel.py\n+++ b/src/plone/base/interfaces/controlpanel.py\n@@ -695,10 +695,6 @@ class ITinyMCEPluginSchema(Interface):\n ITinyMCELibrariesSchema = ITinyMCEPluginSchema # bw compat\n \n \n-class ITinyMCESpellCheckerSchema(Interface):\n- """This interface defines the libraries properties."""\n-\n-\n class ITinyMCEResourceTypesSchema(Interface):\n """This interface defines the resource types properties."""\n \n@@ -776,7 +772,6 @@ class ITinyMCEAdvancedSchema(Interface):\n class ITinyMCESchema(\n ITinyMCELayoutSchema,\n ITinyMCEPluginSchema,\n- ITinyMCESpellCheckerSchema,\n ITinyMCEResourceTypesSchema,\n ITinyMCEAdvancedSchema,\n ):\n' +b'diff --git a/plone/app/upgrade/__init__.py b/plone/app/upgrade/__init__.py\nindex 35612617..7fefd73a 100644\n--- a/plone/app/upgrade/__init__.py\n+++ b/plone/app/upgrade/__init__.py\n@@ -21,6 +21,7 @@ def getNonInstallableProducts(self):\n return [\n "plone.app.upgrade.v52",\n "plone.app.upgrade.v60",\n+ "plone.app.upgrade.v61",\n ]\n \n def getNonInstallableProfiles(self):\n' -Repository: plone.base +Repository: plone.app.upgrade -Branch: refs/heads/main -Date: 2024-06-19T15:19:59+02:00 +Branch: refs/heads/master +Date: 2024-06-19T15:20:02+02:00 Author: Maurits van Rees (mauritsvanrees) -Commit: https://github.com/plone/plone.base/commit/4a0e4b285114fb54bb1556e0a75d7bf5c8000a4b +Commit: https://github.com/plone/plone.app.upgrade/commit/8bf1dfbb3c134faa2d39b8d4e4ae86e0a4b2e1a2 -Merge pull request #33 from plone/cleanup-patterns +Merge pull request #328 from plone/cleanup-patterns -Cleanup patterns settings +Add upgrade step that removes AtD settings Files changed: -A news/33-1.bugfix -A news/33-2.bugfix -M src/plone/base/interfaces/__init__.py -M src/plone/base/interfaces/controlpanel.py -D src/plone/base/interfaces/atd.py +A plone/app/upgrade/v61/profiles.zcml +A plone/app/upgrade/v61/profiles/to6103/registry.xml +M plone/app/upgrade/__init__.py +M plone/app/upgrade/v61/configure.zcml -b'diff --git a/news/33-1.bugfix b/news/33-1.bugfix\nnew file mode 100644\nindex 0000000..64cdb7b\n--- /dev/null\n+++ b/news/33-1.bugfix\n@@ -0,0 +1 @@\n+Mockup TinyMCE settings: Remove deprecated AtD plugin settings.\ndiff --git a/news/33-2.bugfix b/news/33-2.bugfix\nnew file mode 100644\nindex 0000000..31b4172\n--- /dev/null\n+++ b/news/33-2.bugfix\n@@ -0,0 +1 @@\n+Mockup TinyMCE settings: Remove unused AtD related views and interfaces.\ndiff --git a/src/plone/base/interfaces/__init__.py b/src/plone/base/interfaces/__init__.py\nindex 6c60588..6ffd695 100644\n--- a/src/plone/base/interfaces/__init__.py\n+++ b/src/plone/base/interfaces/__init__.py\n@@ -27,7 +27,6 @@\n from .controlpanel import ITinyMCEPluginSchema\n from .controlpanel import ITinyMCEResourceTypesSchema\n from .controlpanel import ITinyMCESchema\n-from .controlpanel import ITinyMCESpellCheckerSchema\n from .controlpanel import ITypesSchema\n from .controlpanel import IUserGroupsSettingsSchema\n from .events import IConfigurationChangedEvent\ndiff --git a/src/plone/base/interfaces/atd.py b/src/plone/base/interfaces/atd.py\ndeleted file mode 100644\nindex 1fe9ebc..0000000\n--- a/src/plone/base/interfaces/atd.py\n+++ /dev/null\n@@ -1,10 +0,0 @@\n-from zope.interface import Interface\n-\n-\n-class IATDProxyView(Interface):\n- """Proxy view for the \'After the Deadline" spellchecker"""\n-\n- def checkDocument(self):\n- """Proxy for the AtD service\'s checkDocument function\n- See http://www.afterthedeadline.com/api.slp for more info.\n- """\ndiff --git a/src/plone/base/interfaces/controlpanel.py b/src/plone/base/interfaces/controlpanel.py\nindex 7f57588..4ba876f 100644\n--- a/src/plone/base/interfaces/controlpanel.py\n+++ b/src/plone/base/interfaces/controlpanel.py\n@@ -695,79 +695,6 @@ class ITinyMCEPluginSchema(Interface):\n ITinyMCELibrariesSchema = ITinyMCEPluginSchema # bw compat\n \n \n-class ITinyMCESpellCheckerSchema(Interface):\n- """This interface defines the libraries properties."""\n-\n- libraries_spellchecker_choice = schema.Choice(\n- title=_("Spellchecker plugin to use"),\n- description=_("This option allows you to choose the spellchecker for TinyMCE."),\n- missing_value=set(),\n- vocabulary=SimpleVocabulary(\n- [\n- SimpleTerm("browser", "browser", _("Default browser spellchecker")),\n- SimpleTerm("AtD", "AtD", _("After the deadline (FLOSS)")),\n- ]\n- ),\n- default="browser",\n- required=False,\n- )\n-\n- libraries_atd_ignore_strings = schema.List(\n- title=_("AtD ignore strings"),\n- description=_(\n- "label_atd_ignore_strings",\n- default=\'A list of strings which the "After the Deadline" \'\n- "spellchecker should ignore. "\n- "Note: This option is only applicable when the "\n- "appropriate spellchecker has been chosen above.",\n- ),\n- default=["Zope", "Plone", "TinyMCE"],\n- value_type=schema.TextLine(),\n- missing_value=[],\n- required=False,\n- )\n-\n- libraries_atd_show_types = schema.List(\n- title=_("AtD error types to show"),\n- description=_(\n- "help_atderrortypes_to_show",\n- default="A list of error types which the "\n- \'"After the Deadline" spellchecker should check for. \'\n- "By default, all the available error type will be "\n- "listed here.",\n- ),\n- value_type=schema.TextLine(),\n- default=[\n- "Bias Language",\n- "Cliches",\n- "Complex Expression",\n- "Diacritical Marks",\n- "Double Negatives",\n- "Hidden Verbs",\n- "Jargon Language",\n- "Passive voice",\n- "Phrases to Avoid",\n- "Redundant Expression",\n- ],\n- missing_value=[],\n- required=False,\n- )\n-\n- libraries_atd_service_url = schema.TextLine(\n- title=_("AtD service URL"),\n- description=_(\n- "help_atd_service_url",\n- default=\'The URL of the "After the Deadline" grammar and spell \'\n- "checking server. "\n- "The default value is the public server, "\n- "but ideally you should download and install your own "\n- "and specify its address here.",\n- ),\n- required=True,\n- default="service.afterthedeadline.com",\n- )\n-\n-\n class ITinyMCEResourceTypesSchema(Interface):\n """This interface defines the resource types properties."""\n \n@@ -845,7 +772,6 @@ class ITinyMCEAdvancedSchema(Interface):\n class ITinyMCESchema(\n ITinyMCELayoutSchema,\n ITinyMCEPluginSchema,\n- ITinyMCESpellCheckerSchema,\n ITinyMCEResourceTypesSchema,\n ITinyMCEAdvancedSchema,\n ):\n' +b'diff --git a/plone/app/upgrade/__init__.py b/plone/app/upgrade/__init__.py\nindex 35612617..7fefd73a 100644\n--- a/plone/app/upgrade/__init__.py\n+++ b/plone/app/upgrade/__init__.py\n@@ -21,6 +21,7 @@ def getNonInstallableProducts(self):\n return [\n "plone.app.upgrade.v52",\n "plone.app.upgrade.v60",\n+ "plone.app.upgrade.v61",\n ]\n \n def getNonInstallableProfiles(self):\ndiff --git a/plone/app/upgrade/v61/configure.zcml b/plone/app/upgrade/v61/configure.zcml\nindex 53a58156..2512c3f2 100644\n--- a/plone/app/upgrade/v61/configure.zcml\n+++ b/plone/app/upgrade/v61/configure.zcml\n@@ -4,6 +4,8 @@\n i18n_domain="plone"\n >\n \n+ \n+\n \n+\n+ \n \n \n \ndiff --git a/plone/app/upgrade/v61/profiles.zcml b/plone/app/upgrade/v61/profiles.zcml\nnew file mode 100644\nindex 00000000..1dd84f37\n--- /dev/null\n+++ b/plone/app/upgrade/v61/profiles.zcml\n@@ -0,0 +1,14 @@\n+\n+\n+ \n+\n+\ndiff --git a/plone/app/upgrade/v61/profiles/to6103/registry.xml b/plone/app/upgrade/v61/profiles/to6103/registry.xml\nnew file mode 100644\nindex 00000000..3cf11181\n--- /dev/null\n+++ b/plone/app/upgrade/v61/profiles/to6103/registry.xml\n@@ -0,0 +1,7 @@\n+\n+\n+ \n+ \n+ \n+ \n+\n'