Merge remote-tracking branch 'origin/master' into thet-staticresources

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')
 

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)

plone/app/upgrade/v52/configure.zcml

@@ -19,7 +19,6 @@
 
     </gs:upgradeSteps>
 
-
     <gs:upgradeSteps
         source="5200"
         destination="5201"
@@ -33,4 +32,17 @@
 
     </gs:upgradeSteps>
 
+    <gs:upgradeSteps
+        source="5201"
+        destination="5202"
+        profile="Products.CMFPlone:plone">
+
+      <gs:upgradeStep
+           title="Run to52beta1 upgrade profile."
+           description=""
+           handler=".betas.to52beta1"
+           />
+
+    </gs:upgradeSteps>
+
 </configure>

plone/app/upgrade/v52/profiles.zcml

@@ -12,4 +12,13 @@
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
+  <genericsetup:registerProfile
+      name="to52beta1"
+      title="Upgrade profile for Plone 5.2alpha2 to Plone 5.2beta1"
+      description=""
+      directory="profiles/to_beta1"
+      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
 </configure>

plone/app/upgrade/v52/profiles/to_beta1/registry.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<registry>
+
+  <records interface="Products.CMFPlone.interfaces.controlpanel.INavigationSchema" prefix="plone" purge="False">
+    <value key="navigation_depth">1</value>
+  </records>
+
+</registry>