-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Branch: refs/heads/master Date: 2019-05-22T20:08:55+02:00 Author: Philip Bauer (pbauer) <bauer@starzel.de> Commit: plone/plone.app.upgrade@45193ab fix upgrades from Plone 4.3 to 5.2 Files changed: M plone/app/upgrade/v43/final.py Repository: plone.app.upgrade Branch: refs/heads/master Date: 2019-06-13T12:50:58+02:00 Author: Philip Bauer (pbauer) <bauer@starzel.de> Commit: plone/plone.app.upgrade@aa27f74 add changenote Files changed: A news/207.bugfix Repository: plone.app.upgrade Branch: refs/heads/master Date: 2019-06-15T20:06:43+02:00 Author: Philip Bauer (pbauer) <bauer@starzel.de> Commit: plone/plone.app.upgrade@2fbe849 Merge pull request #207 from plone/fix_upgrade_from_p4 Fix upgrades from Plone 4.3 to 5.2 Files changed: A news/207.bugfix M plone/app/upgrade/v43/final.py
- Loading branch information
Showing
1 changed file
with
19 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,48 +1,48 @@ | ||
Repository: Products.ATContentTypes | ||
Repository: plone.app.upgrade | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2019-05-22T20:16:22+02:00 | ||
Date: 2019-05-22T20:08:55+02:00 | ||
Author: Philip Bauer (pbauer) <bauer@starzel.de> | ||
Commit: https://github.com/plone/Products.ATContentTypes/commit/30e5c76d792cf256d334e249e76b08dbd29b9170 | ||
Commit: https://github.com/plone/plone.app.upgrade/commit/45193ab29e663eb50e7f96d49c88c0884b3b2666 | ||
|
||
Fix full_folder_view view in Plone 5.2 | ||
fix upgrades from Plone 4.3 to 5.2 | ||
|
||
Files changed: | ||
M Products/ATContentTypes/skins/ATContentTypes/folder_full_view_item.pt | ||
M plone/app/upgrade/v43/final.py | ||
|
||
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' | ||
b'diff --git a/plone/app/upgrade/v43/final.py b/plone/app/upgrade/v43/final.py\nindex d503ecab..f4b85199 100644\n--- a/plone/app/upgrade/v43/final.py\n+++ b/plone/app/upgrade/v43/final.py\n@@ -272,7 +272,10 @@ def removeFakeKupu(context):\n tool = getToolByName(portal, tool_id, None)\n if tool is None:\n continue\n- resources = tool.getResourcesDict()\n+ try:\n+ resources = tool.getResourcesDict()\n+ except AttributeError:\n+ continue\n for resource_id, resource in resources.items():\n expression = resource.getExpression()\n if expression.startswith(bad_expr):\n' | ||
|
||
Repository: Products.ATContentTypes | ||
Repository: plone.app.upgrade | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2019-06-13T12:44:49+02:00 | ||
Date: 2019-06-13T12:50:58+02:00 | ||
Author: Philip Bauer (pbauer) <bauer@starzel.de> | ||
Commit: https://github.com/plone/Products.ATContentTypes/commit/f79e97a07ec65962d6c83075502dc2752fe99c3f | ||
Commit: https://github.com/plone/plone.app.upgrade/commit/aa27f74cafab46a23b6f6a49d983c3ba68cf754c | ||
|
||
add changenote | ||
|
||
Files changed: | ||
A news/64.bugfix | ||
A news/207.bugfix | ||
|
||
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' | ||
b'diff --git a/news/207.bugfix b/news/207.bugfix\nnew file mode 100644\nindex 00000000..72a0fe99\n--- /dev/null\n+++ b/news/207.bugfix\n@@ -0,0 +1,2 @@\n+Fix upgrades from Plone 4.3 to 5.2.\n+[pbauer]\n\\ No newline at end of file\n' | ||
|
||
Repository: Products.ATContentTypes | ||
Repository: plone.app.upgrade | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2019-06-15T17:23:54+02:00 | ||
Date: 2019-06-15T20:06:43+02:00 | ||
Author: Philip Bauer (pbauer) <bauer@starzel.de> | ||
Commit: https://github.com/plone/Products.ATContentTypes/commit/6cf1b5087ef0fbdd1b3dfba79ff08b037b607dd1 | ||
Commit: https://github.com/plone/plone.app.upgrade/commit/2fbe849004773453f0ee23673d7de869d846f95b | ||
|
||
Merge pull request #64 from plone/fix_full_folder_view_p52 | ||
Merge pull request #207 from plone/fix_upgrade_from_p4 | ||
|
||
Fix full_folder_view view in Plone 5.2 | ||
Fix upgrades from Plone 4.3 to 5.2 | ||
|
||
Files changed: | ||
A news/64.bugfix | ||
M Products/ATContentTypes/skins/ATContentTypes/folder_full_view_item.pt | ||
A news/207.bugfix | ||
M plone/app/upgrade/v43/final.py | ||
|
||
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' | ||
b'diff --git a/news/207.bugfix b/news/207.bugfix\nnew file mode 100644\nindex 00000000..72a0fe99\n--- /dev/null\n+++ b/news/207.bugfix\n@@ -0,0 +1,2 @@\n+Fix upgrades from Plone 4.3 to 5.2.\n+[pbauer]\n\\ No newline at end of file\ndiff --git a/plone/app/upgrade/v43/final.py b/plone/app/upgrade/v43/final.py\nindex d503ecab..f4b85199 100644\n--- a/plone/app/upgrade/v43/final.py\n+++ b/plone/app/upgrade/v43/final.py\n@@ -272,7 +272,10 @@ def removeFakeKupu(context):\n tool = getToolByName(portal, tool_id, None)\n if tool is None:\n continue\n- resources = tool.getResourcesDict()\n+ try:\n+ resources = tool.getResourcesDict()\n+ except AttributeError:\n+ continue\n for resource_id, resource in resources.items():\n expression = resource.getExpression()\n if expression.startswith(bad_expr):\n' | ||
|