From 185bfcc0ab0718419c2cb3eb6d84e6de1aa425bc Mon Sep 17 00:00:00 2001 From: davisagli Date: Wed, 4 Sep 2024 14:03:46 -0700 Subject: [PATCH] [fc] Repository: Products.CMFPlone Branch: refs/heads/6.0.x Date: 2024-09-04T14:03:46-07:00 Author: David Glick (davisagli) Commit: https://github.com/plone/Products.CMFPlone/commit/1f4ed3954af0b012d75ef4a5f6b05d5c9ff538c9 Update help text for redirector target path (#4007) * Update help text for redirector target path * changelog Files changed: A news/4007.bugfix M Products/CMFPlone/controlpanel/browser/redirects-controlpanel.pt --- last_commit.txt | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index 4ad61481c5..fedddb854f 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,26 +1,20 @@ -Repository: plone.restapi +Repository: Products.CMFPlone -Branch: refs/heads/main -Date: 2024-09-04T21:43:29+02:00 -Author: Maurits van Rees (mauritsvanrees) -Commit: https://github.com/plone/plone.restapi/commit/7b1f0f4c4bff5cba26cf7925e306cfa12fc2c3b3 +Branch: refs/heads/6.0.x +Date: 2024-09-04T14:03:46-07:00 +Author: David Glick (davisagli) +Commit: https://github.com/plone/Products.CMFPlone/commit/1f4ed3954af0b012d75ef4a5f6b05d5c9ff538c9 -Explicitly globally disable comments in the tests that need it. (#1805) +Update help text for redirector target path (#4007) -In Plone 6.1, when you actively activate plone.app.discussion, we may globally enable comments by default. -This is when https://github.com/plone/plone.app.discussion/pull/244 gets merged. +* Update help text for redirector target path -We already had eight or so tests that explicitly globally enable comments. -Now we explicitly globally disable them in two others. -Then the tests work in Plone 6.0 and 6.1. - -See two test failures here for the plone.app.discussion PR: -https://jenkins.plone.org/job/pull-request-6.1-3.10/311/ +* changelog Files changed: -A news/244.tests -M src/plone/restapi/tests/test_dxcontent_serializer.py +A news/4007.bugfix +M Products/CMFPlone/controlpanel/browser/redirects-controlpanel.pt -b'diff --git a/news/244.tests b/news/244.tests\nnew file mode 100644\nindex 000000000..0ee4acc1f\n--- /dev/null\n+++ b/news/244.tests\n@@ -0,0 +1,2 @@\n+Explicitly globally disable comments in the tests that need it.\n+[maurits]\n\\ No newline at end of file\ndiff --git a/src/plone/restapi/tests/test_dxcontent_serializer.py b/src/plone/restapi/tests/test_dxcontent_serializer.py\nindex 789cf865f..6fd514956 100644\n--- a/src/plone/restapi/tests/test_dxcontent_serializer.py\n+++ b/src/plone/restapi/tests/test_dxcontent_serializer.py\n@@ -527,6 +527,9 @@ def test_allow_discussion_by_default(self):\n self.assertEqual(False, obj["allow_discussion"])\n \n def test_allow_discussion_obj_instance_allows_but_not_global_enabled(self):\n+ registry = queryUtility(IRegistry)\n+ settings = registry.forInterface(IDiscussionSettings, check=False)\n+ settings.globally_enabled = False\n self.portal.invokeFactory("Document", id="doc2")\n self.portal.doc2.allow_discussion = True\n serializer = getMultiAdapter((self.portal.doc2, self.request), ISerializeToJson)\n@@ -536,6 +539,9 @@ def test_allow_discussion_obj_instance_allows_but_not_global_enabled(self):\n self.assertEqual(False, obj["allow_discussion"])\n \n def test_allow_discussion_fti_allows_not_global_enabled(self):\n+ registry = queryUtility(IRegistry)\n+ settings = registry.forInterface(IDiscussionSettings, check=False)\n+ settings.globally_enabled = False\n self.portal.invokeFactory("Document", id="doc2")\n portal_types = getToolByName(self.portal, "portal_types")\n document_fti = getattr(portal_types, self.portal.doc2.portal_type)\n' +b'diff --git a/Products/CMFPlone/controlpanel/browser/redirects-controlpanel.pt b/Products/CMFPlone/controlpanel/browser/redirects-controlpanel.pt\nindex c2ab5a5ee3..dc1f3bc5b3 100644\n--- a/Products/CMFPlone/controlpanel/browser/redirects-controlpanel.pt\n+++ b/Products/CMFPlone/controlpanel/browser/redirects-controlpanel.pt\n@@ -124,7 +124,7 @@\n \n \n \n- Enter the absolute path of the target. The path must start with \'/\'.\n+ Enter the absolute path of the target.\n Target must exist or be an existing alternative url path to the target.\n \n \ndiff --git a/news/4007.bugfix b/news/4007.bugfix\nnew file mode 100644\nindex 0000000000..8f81e077e7\n--- /dev/null\n+++ b/news/4007.bugfix\n@@ -0,0 +1 @@\n+Fix help text for redirect target path. @davisagli\n'