From 0bb26ee3bb6d692129f48d7a6ccb9fea3bceaf4f Mon Sep 17 00:00:00 2001 From: EEA Jenkins <2368628+eea-jenkins@users.noreply.github.com> Date: Fri, 4 Oct 2024 11:47:22 +0300 Subject: [PATCH 1/4] Back to devel --- docs/HISTORY.txt | 3 +++ eea/coremetadata/version.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 1eac1a3..1ba1474 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,6 +1,9 @@ Changelog ========= +4.4-dev0 - (unreleased) +--------------------------- + 4.3 - (2024-10-01) --------------------------- * Change: Fix other organisations metadata diff --git a/eea/coremetadata/version.txt b/eea/coremetadata/version.txt index 69df05f..6fcbf5a 100644 --- a/eea/coremetadata/version.txt +++ b/eea/coremetadata/version.txt @@ -1 +1 @@ -4.3 +4.4-dev0 From 57facf5ddb48bcf1fc937904b912577111fb4980 Mon Sep 17 00:00:00 2001 From: Laszlo Cseh <33250678+laszlocseh@users.noreply.github.com> Date: Thu, 17 Oct 2024 10:50:56 +0300 Subject: [PATCH 2/4] fix: added upgradestep 5.1 to disable other_organisations behavior on all content types - refs #277708 --- docs/HISTORY.txt | 4 +++- eea/coremetadata/profiles/default/metadata.xml | 2 +- eea/coremetadata/upgrades/configure.zcml | 9 +++++++++ eea/coremetadata/upgrades/to_51.py | 17 +++++++++++++++++ eea/coremetadata/version.txt | 2 +- 5 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 eea/coremetadata/upgrades/to_51.py diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 1ba1474..fed8d71 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,8 +1,10 @@ Changelog ========= -4.4-dev0 - (unreleased) +5.1-dev0 - (unreleased) --------------------------- +* Fix: disable other_organisations behavior on all content types + [laszlocseh] 4.3 - (2024-10-01) --------------------------- diff --git a/eea/coremetadata/profiles/default/metadata.xml b/eea/coremetadata/profiles/default/metadata.xml index 3f3586b..27aa217 100644 --- a/eea/coremetadata/profiles/default/metadata.xml +++ b/eea/coremetadata/profiles/default/metadata.xml @@ -1,6 +1,6 @@ - 4.0 + 5.1 profile-collective.taxonomy:default diff --git a/eea/coremetadata/upgrades/configure.zcml b/eea/coremetadata/upgrades/configure.zcml index 43cdc35..6388b77 100644 --- a/eea/coremetadata/upgrades/configure.zcml +++ b/eea/coremetadata/upgrades/configure.zcml @@ -105,4 +105,13 @@ profile="eea.coremetadata:default" /> + + diff --git a/eea/coremetadata/upgrades/to_51.py b/eea/coremetadata/upgrades/to_51.py new file mode 100644 index 0000000..03a2a95 --- /dev/null +++ b/eea/coremetadata/upgrades/to_51.py @@ -0,0 +1,17 @@ + +""" Upgrade to 5.1 """ +from plone.dexterity.interfaces import IDexterityFTI +from plone import api +from zope.component import queryUtility + + +def to_51(context): + """Disable EEA Coremetadata Organisations behavior on all content types""" + + portal_types = api.portal.get_tool(name='portal_types') + for fti_id in portal_types.objectIds(): + fti = queryUtility(IDexterityFTI, name=fti_id) + + if fti and 'other_organisations' in fti.behaviors: + fti.behaviors = [ + b for b in fti.behaviors if b != 'other_organisations'] diff --git a/eea/coremetadata/version.txt b/eea/coremetadata/version.txt index 6fcbf5a..8b1aa6f 100644 --- a/eea/coremetadata/version.txt +++ b/eea/coremetadata/version.txt @@ -1 +1 @@ -4.4-dev0 +5.1-dev0 From 6da5a02a4b5ebf9359d8589fb3d0ad8aaa0db3da Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Thu, 17 Oct 2024 10:57:03 +0300 Subject: [PATCH 3/4] Updated version to 5.1 --- eea/coremetadata/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/coremetadata/version.txt b/eea/coremetadata/version.txt index 8b1aa6f..a75b92f 100644 --- a/eea/coremetadata/version.txt +++ b/eea/coremetadata/version.txt @@ -1 +1 @@ -5.1-dev0 +5.1 From 2cc88b4f0ec1a3a8301d8f6646d2b3746450b97e Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Thu, 17 Oct 2024 10:57:05 +0300 Subject: [PATCH 4/4] Updated changelog - removed develop information --- docs/HISTORY.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index fed8d71..827d9e2 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,7 +1,7 @@ Changelog ========= -5.1-dev0 - (unreleased) +5.1 - (2024-10-17) --------------------------- * Fix: disable other_organisations behavior on all content types [laszlocseh]