[fc] Repository: Products.CMFEditions

Branch: refs/heads/master Date: 2025-02-18T15:48:35+05:30 Author: nileshgulia1 (nileshgulia1) <[email protected]> Commit: plone/Products.CMFEditions@847ccd1 fix(portal_repository): retrieve-rollback changes made in wrapping parent to current obj Files changed: M Products/CMFEditions/CopyModifyMergeRepositoryTool.py Repository: Products.CMFEditions Branch: refs/heads/master Date: 2025-02-18T21:41:38-08:00 Author: David Glick (davisagli) <[email protected]> Commit: plone/Products.CMFEditions@22e8e68 changelog Files changed: A news/120.bugfix Repository: Products.CMFEditions Branch: refs/heads/master Date: 2025-02-18T21:42:36-08:00 Author: David Glick (davisagli) <[email protected]> Commit: plone/Products.CMFEditions@f550e0e Merge pull request #120 from plone/fix-wrapping-parent fix(portal_repository): retrieve-rollback changes made in wrapping pa… Files changed: A news/120.bugfix M Products/CMFEditions/CopyModifyMergeRepositoryTool.py
plone · Feb 19, 2025 · 941382d · 941382d
1 parent 949c422
commit 941382d
Showing 1 changed file with 41 additions and 9 deletions.
diff --git a/last_commit.txt b/last_commit.txt
@@ -1,16 +1,48 @@
-Repository: Products.CMFPlone
+Repository: Products.CMFEditions
 
 
-Branch: refs/heads/6.1.x
-Date: 2025-02-18T19:44:00+01:00
-Author: Rohan Shaw (rohnsha0) <rohnsha0@gmail.com>
-Commit: https://github.com/plone/Products.CMFPlone/commit/5b1042015c0500c3c9db9ec8e6158f590f17abcd
+Branch: refs/heads/master
+Date: 2025-02-18T15:48:35+05:30
+Author: nileshgulia1 (nileshgulia1) <nileshgulia@gmail.com>
+Commit: https://github.com/plone/Products.CMFEditions/commit/847ccd1c0a5c93c9f9aee2405db4e65d2db7d205
 
-Update GPL license link in footer template
+fix(portal_repository): retrieve-rollback changes made in wrapping parent to current obj
 
 Files changed:
-A news/4108.bugfix
-M Products/CMFPlone/browser/templates/footer.pt
+M Products/CMFEditions/CopyModifyMergeRepositoryTool.py
 
-b'diff --git a/Products/CMFPlone/browser/templates/footer.pt b/Products/CMFPlone/browser/templates/footer.pt\nindex 2581534645..805825ad83 100644\n--- a/Products/CMFPlone/browser/templates/footer.pt\n+++ b/Products/CMFPlone/browser/templates/footer.pt\n@@ -29,7 +29,7 @@\n       <span i18n:translate="description_license" tal:omit-tag="">\n       Distributed under the\n            <span i18n:name="license" tal:omit-tag="">\n-                <a href="http://creativecommons.org/licenses/GPL/2.0/" i18n:translate="label_gnu_gpl_licence">GNU GPL license</a></span>.\n+                <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html" i18n:translate="label_gnu_gpl_licence">GNU GPL license</a></span>.\n       </span>\n     </div>\n \ndiff --git a/news/4108.bugfix b/news/4108.bugfix\nnew file mode 100644\nindex 0000000000..b506e4fa6a\n--- /dev/null\n+++ b/news/4108.bugfix\n@@ -0,0 +1 @@\n+Update broken GNU GPLv2 license link in footer. @rohnsha0\n'
+b'diff --git a/Products/CMFEditions/CopyModifyMergeRepositoryTool.py b/Products/CMFEditions/CopyModifyMergeRepositoryTool.py\nindex c3e5316..9b167cb 100644\n--- a/Products/CMFEditions/CopyModifyMergeRepositoryTool.py\n+++ b/Products/CMFEditions/CopyModifyMergeRepositoryTool.py\n@@ -514,8 +514,8 @@ def _retrieve(self, obj, selector, preserve, countPurged):\n             inplace=False,\n             countPurged=countPurged,\n         )\n-        saved.rollback()\n         wrapped = wrap(vd.data.object, aq_parent(aq_inner(obj)))\n+        saved.rollback()\n         return VersionData(wrapped, vd.preserved_data, vd.sys_metadata, vd.app_metadata)\n \n     def _recursiveRetrieve(\n'
+
+Repository: Products.CMFEditions
+
+
+Branch: refs/heads/master
+Date: 2025-02-18T21:41:38-08:00
+Author: David Glick (davisagli) <[email protected]>
+Commit: https://github.com/plone/Products.CMFEditions/commit/22e8e687d273ef3e3e11c6782f8cfb8a66a8cf14
+
+changelog
+
+Files changed:
+A news/120.bugfix
+
+b'diff --git a/news/120.bugfix b/news/120.bugfix\nnew file mode 100644\nindex 00000000..e56453a5\n--- /dev/null\n+++ b/news/120.bugfix\n@@ -0,0 +1,2 @@\n+Avoid registering the parent in the current ZODB transaction while retrieving an old\n+version. This helps avoid CSRF errors from plone.protect. @nileshgulia1\n'
+
+Repository: Products.CMFEditions
+
+
+Branch: refs/heads/master
+Date: 2025-02-18T21:42:36-08:00
+Author: David Glick (davisagli) <[email protected]>
+Commit: https://github.com/plone/Products.CMFEditions/commit/f550e0ef4d4080489e1092aa2e6ac0bb793cf656
+
+Merge pull request #120 from plone/fix-wrapping-parent
+
+fix(portal_repository): retrieve-rollback changes made in wrapping pa…
+
+Files changed:
+A news/120.bugfix
+M Products/CMFEditions/CopyModifyMergeRepositoryTool.py
+
+b'diff --git a/Products/CMFEditions/CopyModifyMergeRepositoryTool.py b/Products/CMFEditions/CopyModifyMergeRepositoryTool.py\nindex c3e53168..9b167cb1 100644\n--- a/Products/CMFEditions/CopyModifyMergeRepositoryTool.py\n+++ b/Products/CMFEditions/CopyModifyMergeRepositoryTool.py\n@@ -514,8 +514,8 @@ def _retrieve(self, obj, selector, preserve, countPurged):\n             inplace=False,\n             countPurged=countPurged,\n         )\n-        saved.rollback()\n         wrapped = wrap(vd.data.object, aq_parent(aq_inner(obj)))\n+        saved.rollback()\n         return VersionData(wrapped, vd.preserved_data, vd.sys_metadata, vd.app_metadata)\n \n     def _recursiveRetrieve(\ndiff --git a/news/120.bugfix b/news/120.bugfix\nnew file mode 100644\nindex 00000000..e56453a5\n--- /dev/null\n+++ b/news/120.bugfix\n@@ -0,0 +1,2 @@\n+Avoid registering the parent in the current ZODB transaction while retrieving an old\n+version. This helps avoid CSRF errors from plone.protect. @nileshgulia1\n'