From e1d703f5da4ffff378b6ba805179a2bb714bebf0 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Tue, 18 Feb 2020 21:52:51 +0100 Subject: [PATCH 1/3] Removed dependency to plone.app.iterate --- bika/lims/profiles/default/metadata.xml | 1 - bika/lims/upgrade/v01_03_003.py | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/bika/lims/profiles/default/metadata.xml b/bika/lims/profiles/default/metadata.xml index b10fbaa1b2..6f79579aaa 100644 --- a/bika/lims/profiles/default/metadata.xml +++ b/bika/lims/profiles/default/metadata.xml @@ -5,7 +5,6 @@ profile-jarn.jsi18n:default profile-Products.ATExtensions:default profile-Products.CMFEditions:CMFEditions - profile-plone.app.iterate:plone.app.iterate profile-Products.TinyMCE:TinyMCE profile-collective.js.jqueryui:default profile-Products.DataGridField:default diff --git a/bika/lims/upgrade/v01_03_003.py b/bika/lims/upgrade/v01_03_003.py index 27d26a4aa8..5aae521424 100644 --- a/bika/lims/upgrade/v01_03_003.py +++ b/bika/lims/upgrade/v01_03_003.py @@ -397,6 +397,8 @@ def upgrade(tool): # Add progress metadata column for Batches add_metadata(portal, BIKA_CATALOG, "getProgress", True) + uninstall_plone_app_iterate(portal) + logger.info("{0} upgraded to version {1}".format(product, version)) return True @@ -901,3 +903,13 @@ def remove_arimports(portal): logger.info("Removing AR Imports folder [DONE]") + +def uninstall_plone_app_iterate(portal): + """Uninstall plone.app.iterate + """ + qi = api.get_tool("portal_quickinstaller") + profile = "plone.app.iterate" + if qi.isProductInstalled(profile): + logger.info("Uninstalling '{}' ...".format(profile)) + qi.uninstallProducts(products=[profile]) + logger.info("Uninstalling '{}' [DONE]".format(profile)) From df974ae662a9ce4b49e5a123651ba9733f3515d0 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Tue, 18 Feb 2020 21:58:39 +0100 Subject: [PATCH 2/3] Added link to PR --- bika/lims/upgrade/v01_03_003.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bika/lims/upgrade/v01_03_003.py b/bika/lims/upgrade/v01_03_003.py index 5aae521424..306dc7c83d 100644 --- a/bika/lims/upgrade/v01_03_003.py +++ b/bika/lims/upgrade/v01_03_003.py @@ -397,6 +397,7 @@ def upgrade(tool): # Add progress metadata column for Batches add_metadata(portal, BIKA_CATALOG, "getProgress", True) + # https://github.com/senaite/senaite.core/pull/1551 uninstall_plone_app_iterate(portal) logger.info("{0} upgraded to version {1}".format(product, version)) From 61f7aa61949c98f9b747e25af426385f17a4cc92 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Tue, 18 Feb 2020 22:00:21 +0100 Subject: [PATCH 3/3] Changelog updated --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index 2e016ed85a..698ca44bac 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -45,6 +45,7 @@ Changelog **Removed** +- #1551 Removed dependency to plone.app.iterate - #1530 Removed ARImport - #1530 Removed stale type registrations - #1541 Remove add/edit options of ReferenceWidget