From 7565c7b4fcb968ca2d0ff9f4dcf3651de489cd55 Mon Sep 17 00:00:00 2001 From: Peter Holzer Date: Tue, 2 Oct 2018 15:36:40 +0200 Subject: [PATCH 1/5] Add exclude_from_nav index for new navigation --- plone/app/upgrade/v52/alphas.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/plone/app/upgrade/v52/alphas.py b/plone/app/upgrade/v52/alphas.py index 4aa8bd0c..fdf52cfe 100644 --- a/plone/app/upgrade/v52/alphas.py +++ b/plone/app/upgrade/v52/alphas.py @@ -16,7 +16,7 @@ def cleanup_resources(): registry = getUtility(IRegistry) record = 'plone.bundles/plone-legacy.resources' resources = registry.records[record] - + if u'jquery-highlightsearchterms' in resources.value: resources.value.remove(u'jquery-highlightsearchterms') @@ -29,6 +29,23 @@ def migrate_gopipindex(context): manage_addGopipIndex(catalog, 'getObjPositionInParent') +def add_exclude_from_nav_index(context): + """Add exclude_from_nav index to the portal_catalog. + """ + name = 'exclude_from_nav' + meta_type = 'BooleanIndex' + catalog = getToolByName(context, 'portal_catalog') + indexes = catalog.indexes() + indexables = [] + if 'name' not in indexes: + catalog.addIndex(name, meta_type) + indexables.append(name) + logger.info('Added %s for field %s.', meta_type, name) + if len(indexables) > 0: + logger.info('Indexing new indexes %s.', ', '.join(indexables)) + catalog.manage_reindexIndex(ids=indexables) + + def to52alpha1(context): loadMigrationProfile(context, 'profile-plone.app.upgrade.v52:to52alpha1') portal = getToolByName(context, 'portal_url').getPortalObject() @@ -36,3 +53,4 @@ def to52alpha1(context): cleanup_resources() migrate_gopipindex(context) + add_exclude_from_nav_index(context) From bf51f773f0b4204147d98cf88ff9e8c681308121 Mon Sep 17 00:00:00 2001 From: Peter Holzer Date: Fri, 9 Nov 2018 00:27:35 +0900 Subject: [PATCH 2/5] add registry key for navigation_depth --- plone/app/upgrade/v52/alphas.py | 4 ++++ plone/app/upgrade/v52/configure.zcml | 6 ++++++ plone/app/upgrade/v52/profiles.zcml | 9 +++++++++ plone/app/upgrade/v52/profiles/to_alpha2/.gitkeep | 0 plone/app/upgrade/v52/profiles/to_alpha2/registry.xml | 7 +++++++ 5 files changed, 26 insertions(+) create mode 100644 plone/app/upgrade/v52/profiles/to_alpha2/.gitkeep create mode 100644 plone/app/upgrade/v52/profiles/to_alpha2/registry.xml diff --git a/plone/app/upgrade/v52/alphas.py b/plone/app/upgrade/v52/alphas.py index fdf52cfe..987fe215 100644 --- a/plone/app/upgrade/v52/alphas.py +++ b/plone/app/upgrade/v52/alphas.py @@ -54,3 +54,7 @@ def to52alpha1(context): cleanup_resources() migrate_gopipindex(context) add_exclude_from_nav_index(context) + + +def to52alpha2(context): + loadMigrationProfile(context, 'profile-plone.app.upgrade.v52:to52alpha2') diff --git a/plone/app/upgrade/v52/configure.zcml b/plone/app/upgrade/v52/configure.zcml index 29ac7245..d544a6b0 100644 --- a/plone/app/upgrade/v52/configure.zcml +++ b/plone/app/upgrade/v52/configure.zcml @@ -17,6 +17,12 @@ handler=".alphas.to52alpha1" /> + + diff --git a/plone/app/upgrade/v52/profiles.zcml b/plone/app/upgrade/v52/profiles.zcml index 93c6f7f6..5d260dec 100644 --- a/plone/app/upgrade/v52/profiles.zcml +++ b/plone/app/upgrade/v52/profiles.zcml @@ -12,4 +12,13 @@ provides="Products.GenericSetup.interfaces.EXTENSION" /> + + diff --git a/plone/app/upgrade/v52/profiles/to_alpha2/.gitkeep b/plone/app/upgrade/v52/profiles/to_alpha2/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/plone/app/upgrade/v52/profiles/to_alpha2/registry.xml b/plone/app/upgrade/v52/profiles/to_alpha2/registry.xml new file mode 100644 index 00000000..b8cbce22 --- /dev/null +++ b/plone/app/upgrade/v52/profiles/to_alpha2/registry.xml @@ -0,0 +1,7 @@ + + + + + 1 + + From 0c9f328fff340728cf00a47b9db58c865d324a5d Mon Sep 17 00:00:00 2001 From: Peter Holzer Date: Tue, 5 Feb 2019 11:28:42 +0100 Subject: [PATCH 3/5] move add_exclude_from_nav_index migration step to betas --- plone/app/upgrade/v52/alphas.py | 18 ----------- plone/app/upgrade/v52/betas.py | 30 +++++++++++++++++++ plone/app/upgrade/v52/configure.zcml | 14 ++++++++- plone/app/upgrade/v52/profiles.zcml | 6 ++-- .../upgrade/v52/profiles/to_alpha1/.gitkeep | 0 .../upgrade/v52/profiles/to_alpha2/.gitkeep | 0 .../{to_alpha2 => to_beta1}/registry.xml | 1 + .../repositorytool.xml | 0 8 files changed, 47 insertions(+), 22 deletions(-) create mode 100644 plone/app/upgrade/v52/betas.py delete mode 100644 plone/app/upgrade/v52/profiles/to_alpha1/.gitkeep delete mode 100644 plone/app/upgrade/v52/profiles/to_alpha2/.gitkeep rename plone/app/upgrade/v52/profiles/{to_alpha2 => to_beta1}/registry.xml (99%) rename plone/app/upgrade/v52/profiles/{to_alpha1 => to_beta1}/repositorytool.xml (100%) diff --git a/plone/app/upgrade/v52/alphas.py b/plone/app/upgrade/v52/alphas.py index 987fe215..39e66e81 100644 --- a/plone/app/upgrade/v52/alphas.py +++ b/plone/app/upgrade/v52/alphas.py @@ -29,23 +29,6 @@ def migrate_gopipindex(context): manage_addGopipIndex(catalog, 'getObjPositionInParent') -def add_exclude_from_nav_index(context): - """Add exclude_from_nav index to the portal_catalog. - """ - name = 'exclude_from_nav' - meta_type = 'BooleanIndex' - catalog = getToolByName(context, 'portal_catalog') - indexes = catalog.indexes() - indexables = [] - if 'name' not in indexes: - catalog.addIndex(name, meta_type) - indexables.append(name) - logger.info('Added %s for field %s.', meta_type, name) - if len(indexables) > 0: - logger.info('Indexing new indexes %s.', ', '.join(indexables)) - catalog.manage_reindexIndex(ids=indexables) - - def to52alpha1(context): loadMigrationProfile(context, 'profile-plone.app.upgrade.v52:to52alpha1') portal = getToolByName(context, 'portal_url').getPortalObject() @@ -53,7 +36,6 @@ def to52alpha1(context): cleanup_resources() migrate_gopipindex(context) - add_exclude_from_nav_index(context) def to52alpha2(context): diff --git a/plone/app/upgrade/v52/betas.py b/plone/app/upgrade/v52/betas.py new file mode 100644 index 00000000..882f7928 --- /dev/null +++ b/plone/app/upgrade/v52/betas.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +from Products.CMFCore.utils import getToolByName +from plone.app.upgrade.utils import loadMigrationProfile + +import logging + + +logger = logging.getLogger('plone.app.upgrade') + + +def add_exclude_from_nav_index(context): + """Add exclude_from_nav index to the portal_catalog. + """ + name = 'exclude_from_nav' + meta_type = 'BooleanIndex' + catalog = getToolByName(context, 'portal_catalog') + indexes = catalog.indexes() + indexables = [] + if 'name' not in indexes: + catalog.addIndex(name, meta_type) + indexables.append(name) + logger.info('Added %s for field %s.', meta_type, name) + if len(indexables) > 0: + logger.info('Indexing new indexes %s.', ', '.join(indexables)) + catalog.manage_reindexIndex(ids=indexables) + + +def to52beta1(context): + loadMigrationProfile(context, 'profile-plone.app.upgrade.v52:to52beta1') + add_exclude_from_nav_index(context) diff --git a/plone/app/upgrade/v52/configure.zcml b/plone/app/upgrade/v52/configure.zcml index d544a6b0..f49f558f 100644 --- a/plone/app/upgrade/v52/configure.zcml +++ b/plone/app/upgrade/v52/configure.zcml @@ -25,7 +25,6 @@ - + + + + + + diff --git a/plone/app/upgrade/v52/profiles.zcml b/plone/app/upgrade/v52/profiles.zcml index 5d260dec..7726c8e2 100644 --- a/plone/app/upgrade/v52/profiles.zcml +++ b/plone/app/upgrade/v52/profiles.zcml @@ -13,10 +13,10 @@ /> diff --git a/plone/app/upgrade/v52/profiles/to_alpha1/.gitkeep b/plone/app/upgrade/v52/profiles/to_alpha1/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/plone/app/upgrade/v52/profiles/to_alpha2/.gitkeep b/plone/app/upgrade/v52/profiles/to_alpha2/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/plone/app/upgrade/v52/profiles/to_alpha2/registry.xml b/plone/app/upgrade/v52/profiles/to_beta1/registry.xml similarity index 99% rename from plone/app/upgrade/v52/profiles/to_alpha2/registry.xml rename to plone/app/upgrade/v52/profiles/to_beta1/registry.xml index b8cbce22..569419e0 100644 --- a/plone/app/upgrade/v52/profiles/to_alpha2/registry.xml +++ b/plone/app/upgrade/v52/profiles/to_beta1/registry.xml @@ -4,4 +4,5 @@ 1 + diff --git a/plone/app/upgrade/v52/profiles/to_alpha1/repositorytool.xml b/plone/app/upgrade/v52/profiles/to_beta1/repositorytool.xml similarity index 100% rename from plone/app/upgrade/v52/profiles/to_alpha1/repositorytool.xml rename to plone/app/upgrade/v52/profiles/to_beta1/repositorytool.xml From 3256c47414016be46996c1944ae3935d2beb334b Mon Sep 17 00:00:00 2001 From: Peter Holzer Date: Tue, 5 Feb 2019 19:33:02 +0100 Subject: [PATCH 4/5] remove to52alpha2 --- plone/app/upgrade/v52/alphas.py | 4 ---- plone/app/upgrade/v52/configure.zcml | 6 ------ 2 files changed, 10 deletions(-) diff --git a/plone/app/upgrade/v52/alphas.py b/plone/app/upgrade/v52/alphas.py index 39e66e81..9d530ae5 100644 --- a/plone/app/upgrade/v52/alphas.py +++ b/plone/app/upgrade/v52/alphas.py @@ -36,7 +36,3 @@ def to52alpha1(context): cleanup_resources() migrate_gopipindex(context) - - -def to52alpha2(context): - loadMigrationProfile(context, 'profile-plone.app.upgrade.v52:to52alpha2') diff --git a/plone/app/upgrade/v52/configure.zcml b/plone/app/upgrade/v52/configure.zcml index f49f558f..09880bfa 100644 --- a/plone/app/upgrade/v52/configure.zcml +++ b/plone/app/upgrade/v52/configure.zcml @@ -17,12 +17,6 @@ handler=".alphas.to52alpha1" /> - - Date: Tue, 5 Feb 2019 20:56:07 +0100 Subject: [PATCH 5/5] fix upgrade step --- plone/app/upgrade/v52/betas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plone/app/upgrade/v52/betas.py b/plone/app/upgrade/v52/betas.py index 882f7928..8e7a1b01 100644 --- a/plone/app/upgrade/v52/betas.py +++ b/plone/app/upgrade/v52/betas.py @@ -16,7 +16,7 @@ def add_exclude_from_nav_index(context): catalog = getToolByName(context, 'portal_catalog') indexes = catalog.indexes() indexables = [] - if 'name' not in indexes: + if name not in indexes: catalog.addIndex(name, meta_type) indexables.append(name) logger.info('Added %s for field %s.', meta_type, name)