From af8395c06024671aebf20be73a7156cf7a6f5592 Mon Sep 17 00:00:00 2001 From: pbauer Date: Sat, 15 Jun 2019 17:23:54 +0200 Subject: [PATCH] [fc] Repository: Products.ATContentTypes Branch: refs/heads/master Date: 2019-05-22T20:16:22+02:00 Author: Philip Bauer (pbauer) Commit: https://github.com/plone/Products.ATContentTypes/commit/30e5c76d792cf256d334e249e76b08dbd29b9170 Fix full_folder_view view in Plone 5.2 Files changed: M Products/ATContentTypes/skins/ATContentTypes/folder_full_view_item.pt Repository: Products.ATContentTypes Branch: refs/heads/master Date: 2019-06-13T12:44:49+02:00 Author: Philip Bauer (pbauer) Commit: https://github.com/plone/Products.ATContentTypes/commit/f79e97a07ec65962d6c83075502dc2752fe99c3f add changenote Files changed: A news/64.bugfix Repository: Products.ATContentTypes Branch: refs/heads/master Date: 2019-06-15T17:23:54+02:00 Author: Philip Bauer (pbauer) Commit: https://github.com/plone/Products.ATContentTypes/commit/6cf1b5087ef0fbdd1b3dfba79ff08b037b607dd1 Merge pull request #64 from plone/fix_full_folder_view_p52 Fix full_folder_view view in Plone 5.2 Files changed: A news/64.bugfix M Products/ATContentTypes/skins/ATContentTypes/folder_full_view_item.pt --- last_commit.txt | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index e8741c062f..ec0edf200a 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,48 +1,48 @@ -Repository: Products.CMFQuickInstallerTool +Repository: Products.ATContentTypes Branch: refs/heads/master -Date: 2019-05-23T20:39:11+02:00 +Date: 2019-05-22T20:16:22+02:00 Author: Philip Bauer (pbauer) -Commit: https://github.com/plone/Products.CMFQuickInstallerTool/commit/70b02dc669749e0766b3840b5e9584d29ae0fcc7 +Commit: https://github.com/plone/Products.ATContentTypes/commit/30e5c76d792cf256d334e249e76b08dbd29b9170 -fix issues during migration form Plone 4.3 to 5.2 +Fix full_folder_view view in Plone 5.2 Files changed: -M Products/CMFQuickInstallerTool/QuickInstallerTool.py +M Products/ATContentTypes/skins/ATContentTypes/folder_full_view_item.pt -b"diff --git a/Products/CMFQuickInstallerTool/QuickInstallerTool.py b/Products/CMFQuickInstallerTool/QuickInstallerTool.py\nindex a2c51fe..2275f55 100644\n--- a/Products/CMFQuickInstallerTool/QuickInstallerTool.py\n+++ b/Products/CMFQuickInstallerTool/QuickInstallerTool.py\n@@ -475,9 +475,12 @@ def snapshotPortal(self, portal):\n state['utilities'] = tuple(getSiteManager().registeredUtilities())\n \n jstool = getToolByName(portal, 'portal_javascripts', None)\n- state['resources_js'] = jstool and jstool.getResourceIds() or []\n csstool = getToolByName(portal, 'portal_css', None)\n- state['resources_css'] = csstool and csstool.getResourceIds() or []\n+ try:\n+ state['resources_js'] = jstool and jstool.getResourceIds() or []\n+ state['resources_css'] = csstool and csstool.getResourceIds() or []\n+ except AttributeError:\n+ pass\n return state\n \n @security.protected(ManagePortal)\n@@ -528,7 +531,7 @@ def deriveSettingsFromSnapshots(self, before, after):\n )\n \n jstool = getToolByName(self, 'portal_javascripts', None)\n- if jstool is not None:\n+ if jstool is not None and 'resources_js' in after:\n settings['resources_js'] = [\n r for r in after['resources_js']\n if r not in before['resources_js']\n" +b'diff --git a/Products/ATContentTypes/skins/ATContentTypes/folder_full_view_item.pt b/Products/ATContentTypes/skins/ATContentTypes/folder_full_view_item.pt\nindex b60457d7..d8f2370e 100644\n--- a/Products/ATContentTypes/skins/ATContentTypes/folder_full_view_item.pt\n+++ b/Products/ATContentTypes/skins/ATContentTypes/folder_full_view_item.pt\n@@ -12,9 +12,10 @@\n tal:define="portal_state context/@@plone_portal_state;\n context_state context/@@plone_context_state;\n plone_view context/@@plone;\n+ plone_layout context/@@plone_layout;\n lang portal_state/language;\n view nocall:view | nocall: plone_view;\n- dummy python: plone_view.mark_view(view);\n+ dummy python: plone_layout.mark_view(view);\n portal_url portal_state/portal_url;\n checkPermission nocall: context/portal_membership/checkPermission;\n site_properties context/portal_properties/site_properties;\n' -Repository: Products.CMFQuickInstallerTool +Repository: Products.ATContentTypes Branch: refs/heads/master -Date: 2019-06-13T12:54:04+02:00 +Date: 2019-06-13T12:44:49+02:00 Author: Philip Bauer (pbauer) -Commit: https://github.com/plone/Products.CMFQuickInstallerTool/commit/2372c4f951a2570a76a9666accf9d4a51e7db2e7 +Commit: https://github.com/plone/Products.ATContentTypes/commit/f79e97a07ec65962d6c83075502dc2752fe99c3f add changenote Files changed: -A news/22.bugfix +A news/64.bugfix -b'diff --git a/news/22.bugfix b/news/22.bugfix\nnew file mode 100644\nindex 0000000..5d3b0d8\n--- /dev/null\n+++ b/news/22.bugfix\n@@ -0,0 +1,2 @@\n+Fix issues during migration form Plone 4.3 to 5.2.\n+[pbauer]\n\\ No newline at end of file\n' +b'diff --git a/news/64.bugfix b/news/64.bugfix\nnew file mode 100644\nindex 00000000..434007c8\n--- /dev/null\n+++ b/news/64.bugfix\n@@ -0,0 +1,2 @@\n+Fix full_folder_view view in Plone 5.2\n+[pbauer]\n\\ No newline at end of file\n' -Repository: Products.CMFQuickInstallerTool +Repository: Products.ATContentTypes Branch: refs/heads/master -Date: 2019-06-15T17:23:17+02:00 +Date: 2019-06-15T17:23:54+02:00 Author: Philip Bauer (pbauer) -Commit: https://github.com/plone/Products.CMFQuickInstallerTool/commit/5a7fa561b93bd3b59526b88c1b8ae805806f8f02 +Commit: https://github.com/plone/Products.ATContentTypes/commit/6cf1b5087ef0fbdd1b3dfba79ff08b037b607dd1 -Merge pull request #22 from plone/fix_upgrade_from_plone4 +Merge pull request #64 from plone/fix_full_folder_view_p52 -fix issues during migration form Plone 4.3 to 5.2 +Fix full_folder_view view in Plone 5.2 Files changed: -A news/22.bugfix -M Products/CMFQuickInstallerTool/QuickInstallerTool.py +A news/64.bugfix +M Products/ATContentTypes/skins/ATContentTypes/folder_full_view_item.pt -b"diff --git a/Products/CMFQuickInstallerTool/QuickInstallerTool.py b/Products/CMFQuickInstallerTool/QuickInstallerTool.py\nindex a2c51fe..2275f55 100644\n--- a/Products/CMFQuickInstallerTool/QuickInstallerTool.py\n+++ b/Products/CMFQuickInstallerTool/QuickInstallerTool.py\n@@ -475,9 +475,12 @@ def snapshotPortal(self, portal):\n state['utilities'] = tuple(getSiteManager().registeredUtilities())\n \n jstool = getToolByName(portal, 'portal_javascripts', None)\n- state['resources_js'] = jstool and jstool.getResourceIds() or []\n csstool = getToolByName(portal, 'portal_css', None)\n- state['resources_css'] = csstool and csstool.getResourceIds() or []\n+ try:\n+ state['resources_js'] = jstool and jstool.getResourceIds() or []\n+ state['resources_css'] = csstool and csstool.getResourceIds() or []\n+ except AttributeError:\n+ pass\n return state\n \n @security.protected(ManagePortal)\n@@ -528,7 +531,7 @@ def deriveSettingsFromSnapshots(self, before, after):\n )\n \n jstool = getToolByName(self, 'portal_javascripts', None)\n- if jstool is not None:\n+ if jstool is not None and 'resources_js' in after:\n settings['resources_js'] = [\n r for r in after['resources_js']\n if r not in before['resources_js']\ndiff --git a/news/22.bugfix b/news/22.bugfix\nnew file mode 100644\nindex 0000000..5d3b0d8\n--- /dev/null\n+++ b/news/22.bugfix\n@@ -0,0 +1,2 @@\n+Fix issues during migration form Plone 4.3 to 5.2.\n+[pbauer]\n\\ No newline at end of file\n" +b'diff --git a/Products/ATContentTypes/skins/ATContentTypes/folder_full_view_item.pt b/Products/ATContentTypes/skins/ATContentTypes/folder_full_view_item.pt\nindex b60457d7..d8f2370e 100644\n--- a/Products/ATContentTypes/skins/ATContentTypes/folder_full_view_item.pt\n+++ b/Products/ATContentTypes/skins/ATContentTypes/folder_full_view_item.pt\n@@ -12,9 +12,10 @@\n tal:define="portal_state context/@@plone_portal_state;\n context_state context/@@plone_context_state;\n plone_view context/@@plone;\n+ plone_layout context/@@plone_layout;\n lang portal_state/language;\n view nocall:view | nocall: plone_view;\n- dummy python: plone_view.mark_view(view);\n+ dummy python: plone_layout.mark_view(view);\n portal_url portal_state/portal_url;\n checkPermission nocall: context/portal_membership/checkPermission;\n site_properties context/portal_properties/site_properties;\ndiff --git a/news/64.bugfix b/news/64.bugfix\nnew file mode 100644\nindex 00000000..434007c8\n--- /dev/null\n+++ b/news/64.bugfix\n@@ -0,0 +1,2 @@\n+Fix full_folder_view view in Plone 5.2\n+[pbauer]\n\\ No newline at end of file\n'