[fc] Repository: Products.CMFPlone

Branch: refs/heads/master
Date: 2024-02-21T16:47:10+01:00
Author: Philip Bauer (pbauer) <[email protected]>
Commit: plone/Products.CMFPlone@255adbb

plone.app.iterate permissions now use rolemap. See plone/plone.app.iterate#120

Files changed:
M Products/CMFPlone/tests/testSiteAdminRole.py
Repository: Products.CMFPlone

Branch: refs/heads/master
Date: 2024-02-21T16:47:25+01:00
Author: Philip Bauer (pbauer) <[email protected]>
Commit: plone/Products.CMFPlone@72df670

add changenote

Files changed:
A news/3907.bugfix

last_commit.txt

@@ -1,17 +1,30 @@
-Repository: plone.app.upgrade
+Repository: Products.CMFPlone
 
 
 Branch: refs/heads/master
-Date: 2024-02-21T15:16:09+01:00
-Author: Peter Mathis (petschki) <[email protected]>
-Commit: https://github.com/plone/plone.app.upgrade/commit/ddf3db89e5150a2cbec96f83f1418b6678232ea9
+Date: 2024-02-21T16:47:10+01:00
+Author: Philip Bauer (pbauer) <[email protected]>
+Commit: https://github.com/plone/Products.CMFPlone/commit/255adbbcc6a19a9dcdc3b01c4496403d3badf4cf
 
-Fix tinymce format icon names (#321)
+plone.app.iterate permissions now use rolemap. See https://github.com/plone/plone.app.iterate/pull/120
 
 Files changed:
-A news/3095.bugfix
-M plone/app/upgrade/v60/configure.zcml
-M plone/app/upgrade/v60/final.py
+M Products/CMFPlone/tests/testSiteAdminRole.py
 
-b'diff --git a/news/3095.bugfix b/news/3095.bugfix\nnew file mode 100644\nindex 00000000..d78152cd\n--- /dev/null\n+++ b/news/3095.bugfix\n@@ -0,0 +1,2 @@\n+Update TinyMCE format icon names.\n+[petschki]\ndiff --git a/plone/app/upgrade/v60/configure.zcml b/plone/app/upgrade/v60/configure.zcml\nindex 01b3009f..ac7261a2 100644\n--- a/plone/app/upgrade/v60/configure.zcml\n+++ b/plone/app/upgrade/v60/configure.zcml\n@@ -358,8 +358,8 @@\n         <!-- Plone 6.0.10 -->\n \n         <gs:upgradeStep\n-            title="Miscellaneous"\n-            handler="..utils.null_upgrade_step"\n+            title="Fix TinyMCE format icon names"\n+            handler=".final.fix_tinymce_format_iconnames"\n             />\n \n     </gs:upgradeSteps>\ndiff --git a/plone/app/upgrade/v60/final.py b/plone/app/upgrade/v60/final.py\nindex 4b6479d2..512544c5 100644\n--- a/plone/app/upgrade/v60/final.py\n+++ b/plone/app/upgrade/v60/final.py\n@@ -206,3 +206,23 @@ def fix_syndication_settings(context):\n         key = f"{old_iface}.{fieldname}"\n         if key in record_keys:\n             del registry.records[key]\n+\n+\n+def fix_tinymce_format_iconnames(context):\n+    """Fix \'strike-through\' and \'sourcecode\'.\n+\n+    See https://github.com/plone/Products.CMFPlone/issues/3905\n+    """\n+    registry = getUtility(IRegistry)\n+    record = registry.records.get("plone.inline_styles")\n+    if record is None:\n+        return\n+    values = record.value\n+    replacements = [\n+        ("Strikethrough|strikethrough|strikethrough", "Strikethrough|strikethrough|strike-through"),\n+        ("Code|code|code", "Code|code|sourcecode")\n+    ]\n+    for _old, _new in replacements:\n+        if _old in values:\n+            values[values.index(_old)] = _new\n+    record.value = values\n'
+b'diff --git a/Products/CMFPlone/tests/testSiteAdminRole.py b/Products/CMFPlone/tests/testSiteAdminRole.py\nindex 64ba35671d..836c9c2992 100644\n--- a/Products/CMFPlone/tests/testSiteAdminRole.py\n+++ b/Products/CMFPlone/tests/testSiteAdminRole.py\n@@ -174,7 +174,7 @@ def testExpectedPermissions(self):\n             pass\n         else:\n             expected.update(\n-                {"iterate : Check in content": 1, "iterate : Check out content": 1}\n+                {"iterate : Check in content": 0, "iterate : Check out content": 0}\n             )\n \n         site = self.portal\n'
+
+Repository: Products.CMFPlone
+
+
+Branch: refs/heads/master
+Date: 2024-02-21T16:47:25+01:00
+Author: Philip Bauer (pbauer) <[email protected]>
+Commit: https://github.com/plone/Products.CMFPlone/commit/72df6707ff2ff6fef986103b2b0ae77b2ed903cc
+
+add changenote
+
+Files changed:
+A news/3907.bugfix
+
+b'diff --git a/news/3907.bugfix b/news/3907.bugfix\nnew file mode 100644\nindex 0000000000..4a9c0e1fe2\n--- /dev/null\n+++ b/news/3907.bugfix\n@@ -0,0 +1,3 @@\n+Adapt tests after plone.app.iterate permissions use rolemap.xml\n+See https://github.com/plone/plone.app.iterate/pull/120\n+[pbauer]\n'