[fc] Repository: plone.app.upgrade

Branch: refs/heads/master Date: 2021-09-29T09:32:25+02:00 Author: Peter Mathis (petschki) <[email protected]> Commit: plone/plone.app.upgrade@94b694a add icon_expr to Plone Site typeinfo Files changed: M plone/app/upgrade/v60/profiles/to_dx_site_root/types/Plone_Site.xml Repository: plone.app.upgrade Branch: refs/heads/master Date: 2021-09-29T09:35:16+02:00 Author: Peter Mathis (petschki) <[email protected]> Commit: plone/plone.app.upgrade@a352d17 add changenote Files changed: M news/6001.bugfix Repository: plone.app.upgrade Branch: refs/heads/master Date: 2021-10-14T15:12:21+02:00 Author: Maurits van Rees (mauritsvanrees) <[email protected]> Commit: plone/plone.app.upgrade@f103029 Merge pull request #259 from plone/petschki-typeinfo-icon Add icon_expr to Plone Site typeinfo Files changed: M news/6001.bugfix M plone/app/upgrade/v60/profiles/to_dx_site_root/types/Plone_Site.xml
plone · Oct 14, 2021 · b43cc80 · b43cc80
1 parent 9d7e8f4
commit b43cc80
Showing 1 changed file with 29 additions and 17 deletions.
diff --git a/last_commit.txt b/last_commit.txt
@@ -1,36 +1,48 @@
-Repository: plone.releaser
+Repository: plone.app.upgrade
 
 
 Branch: refs/heads/master
-Date: 2021-10-13T23:25:02+02:00
-Author: Maurits van Rees (mauritsvanrees) <[email protected]>
-Commit: https://github.com/plone/plone.releaser/commit/41696c473112557317eac91e11d55112ec792040
+Date: 2021-09-29T09:32:25+02:00
+Author: Peter Mathis (petschki) <[email protected]>
+Commit: https://github.com/plone/plone.app.upgrade/commit/94b694a50c8cf9527683a8c81881fc234893ea5a
 
-Do not offer updating core branches 4.3 and 5.1.
+add icon_expr to Plone Site typeinfo
 
-Only 5.2 and 6.0 are maintained.
+Files changed:
+M plone/app/upgrade/v60/profiles/to_dx_site_root/types/Plone_Site.xml
+
+b'diff --git a/plone/app/upgrade/v60/profiles/to_dx_site_root/types/Plone_Site.xml b/plone/app/upgrade/v60/profiles/to_dx_site_root/types/Plone_Site.xml\nindex 45278021..b89fca24 100644\n--- a/plone/app/upgrade/v60/profiles/to_dx_site_root/types/Plone_Site.xml\n+++ b/plone/app/upgrade/v60/profiles/to_dx_site_root/types/Plone_Site.xml\n@@ -60,8 +60,14 @@\n  <alias from="edit" to="@@edit"/>\n  <alias from="sharing" to="@@sharing"/>\n  <alias from="view" to="(selected layout)"/>\n- <action title="View" action_id="view" category="object" condition_expr=""\n-    url_expr="string:${object_url}" visible="True"\n+ <action\n+    title="View"\n+    action_id="view"\n+    category="object"\n+    condition_expr=""\n+    url_expr="string:${object_url}"\n+    icon_expr="string:toolbar-action/view"\n+    visible="True"\n     i18n:attributes="title">\n   <permission value="View"/>\n  </action>\n@@ -72,6 +78,7 @@\n     i18n:attributes="title"\n     title="Edit"\n     url_expr="string:${object_url}/edit"\n+    icon_expr="string:toolbar-action/edit"\n     visible="True">\n   <permission value="Modify portal content"/>\n  </action>\n'
+
+Repository: plone.app.upgrade
+
+
+Branch: refs/heads/master
+Date: 2021-09-29T09:35:16+02:00
+Author: Peter Mathis (petschki) <[email protected]>
+Commit: https://github.com/plone/plone.app.upgrade/commit/a352d17a16c492aebe5272666db4cc3639af6196
+
+add changenote
 
 Files changed:
-A news/41.bugfix
-M plone/releaser/release.py
+M news/6001.bugfix
 
-b'diff --git a/news/41.bugfix b/news/41.bugfix\nnew file mode 100644\nindex 0000000..422df9a\n--- /dev/null\n+++ b/news/41.bugfix\n@@ -0,0 +1,3 @@\n+Do not offer updating core branches 4.3 and 5.1.\n+Only 5.2 and 6.0 are maintained.\n+[maurits]\ndiff --git a/plone/releaser/release.py b/plone/releaser/release.py\nindex 9a7e818..3c703ae 100644\n--- a/plone/releaser/release.py\n+++ b/plone/releaser/release.py\n@@ -222,7 +222,7 @@ def update_core(data, branch=None):\n \n \n def update_other_core_branches(data):\n-    CORE_BRANCHES = ["4.3", "5.1", "5.2", "6.0"]\n+    CORE_BRANCHES = ["5.2", "6.0"]\n     package_name = data["name"]\n     root_path = os.path.join(os.getcwd(), "../../")\n \n'
+b'diff --git a/news/6001.bugfix b/news/6001.bugfix\nindex a07c0d96..ac09a0be 100644\n--- a/news/6001.bugfix\n+++ b/news/6001.bugfix\n@@ -1,2 +1,5 @@\n Added upgrade to 6001, Plone 6.0.0a1.dev1.\n [maurits]\n+\n+Fix icon_expr in typeinfo action\n+[petschki]\n'
 
-Repository: plone.releaser
+Repository: plone.app.upgrade
 
 
 Branch: refs/heads/master
-Date: 2021-10-14T14:10:02+02:00
+Date: 2021-10-14T15:12:21+02:00
 Author: Maurits van Rees (mauritsvanrees) <[email protected]>
-Commit: https://github.com/plone/plone.releaser/commit/70fc49f8d7ca0a0b322c68e6f645d97caa8370a0
+Commit: https://github.com/plone/plone.app.upgrade/commit/f1030297df84ac481f2a8b89c0cc9df6f6072c86
 
-Merge pull request #41 from plone/maurits/remove-43-51
+Merge pull request #259 from plone/petschki-typeinfo-icon
 
-Do not update core branches 4.3 and 5.1.
+Add icon_expr to Plone Site typeinfo
 
 Files changed:
-A news/41.bugfix
-M plone/releaser/release.py
+M news/6001.bugfix
+M plone/app/upgrade/v60/profiles/to_dx_site_root/types/Plone_Site.xml
 
-b'diff --git a/news/41.bugfix b/news/41.bugfix\nnew file mode 100644\nindex 0000000..422df9a\n--- /dev/null\n+++ b/news/41.bugfix\n@@ -0,0 +1,3 @@\n+Do not offer updating core branches 4.3 and 5.1.\n+Only 5.2 and 6.0 are maintained.\n+[maurits]\ndiff --git a/plone/releaser/release.py b/plone/releaser/release.py\nindex 9a7e818..3c703ae 100644\n--- a/plone/releaser/release.py\n+++ b/plone/releaser/release.py\n@@ -222,7 +222,7 @@ def update_core(data, branch=None):\n \n \n def update_other_core_branches(data):\n-    CORE_BRANCHES = ["4.3", "5.1", "5.2", "6.0"]\n+    CORE_BRANCHES = ["5.2", "6.0"]\n     package_name = data["name"]\n     root_path = os.path.join(os.getcwd(), "../../")\n \n'
+b'diff --git a/news/6001.bugfix b/news/6001.bugfix\nindex a07c0d96..ac09a0be 100644\n--- a/news/6001.bugfix\n+++ b/news/6001.bugfix\n@@ -1,2 +1,5 @@\n Added upgrade to 6001, Plone 6.0.0a1.dev1.\n [maurits]\n+\n+Fix icon_expr in typeinfo action\n+[petschki]\ndiff --git a/plone/app/upgrade/v60/profiles/to_dx_site_root/types/Plone_Site.xml b/plone/app/upgrade/v60/profiles/to_dx_site_root/types/Plone_Site.xml\nindex 45278021..b89fca24 100644\n--- a/plone/app/upgrade/v60/profiles/to_dx_site_root/types/Plone_Site.xml\n+++ b/plone/app/upgrade/v60/profiles/to_dx_site_root/types/Plone_Site.xml\n@@ -60,8 +60,14 @@\n  <alias from="edit" to="@@edit"/>\n  <alias from="sharing" to="@@sharing"/>\n  <alias from="view" to="(selected layout)"/>\n- <action title="View" action_id="view" category="object" condition_expr=""\n-    url_expr="string:${object_url}" visible="True"\n+ <action\n+    title="View"\n+    action_id="view"\n+    category="object"\n+    condition_expr=""\n+    url_expr="string:${object_url}"\n+    icon_expr="string:toolbar-action/view"\n+    visible="True"\n     i18n:attributes="title">\n   <permission value="View"/>\n  </action>\n@@ -72,6 +78,7 @@\n     i18n:attributes="title"\n     title="Edit"\n     url_expr="string:${object_url}/edit"\n+    icon_expr="string:toolbar-action/edit"\n     visible="True">\n   <permission value="Modify portal content"/>\n  </action>\n'