Also remove the jquery-highlightsearchterms resource, and the plone_e…

…cmascript skin layer for plone 5.1.4

CHANGES.rst

@@ -14,7 +14,7 @@ New features:
   [frapell]
 
 - Add upgrade step removing the jquery-highlightsearchterms resource
-  and the plone_ecmascript skin layer, on Plone 5.2
+  and the plone_ecmascript skin layer, on Plone 5.2 and 5.1.4
 
 Bug fixes:
 

plone/app/upgrade/v51/configure.zcml

@@ -265,7 +265,7 @@ Add image scaling options to image handling control panel.
         <gs:upgradeStep
             title="Miscellaneous"
             description=""
-            handler="..utils.null_upgrade_step"
+            handler=".final.remove_highlightsearchterms"
             />
 
     </gs:upgradeSteps>

plone/app/upgrade/v51/final.py

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
+from plone.app.upgrade.utils import cleanUpSkinsTool
+from plone.registry.interfaces import IRegistry
 from Products.CMFCore.utils import getToolByName
 from zExceptions import BadRequest
+from zope.component import getUtility
 
 import logging
 
@@ -38,3 +41,14 @@ def fix_i18n_domain(context):
                 'Action object/%s does not have an i18n_domain property',
                 action_id,
             )
+
+
+def remove_highlightsearchterms(context):
+    portal = getToolByName(context, 'portal_url').getPortalObject()
+    cleanUpSkinsTool(portal)
+
+    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/v51/profiles/to_514/registry.xml

@@ -105,18 +105,23 @@
       <value key="js">++plone++static/components/datatables.net-select/js/dataTables.select.min.js</value>
   </records>
 
+  <records prefix="plone.resources/jquery-highlightsearchterms"
+           interface='Products.CMFPlone.interfaces.IResourceRegistry'
+           remove="True">
+  </records>
+
   <!-- Update ``last_compilation`` to deliver new bundles -->
   <records
       prefix="plone.bundles/plone"
       interface="Products.CMFPlone.interfaces.IBundleRegistry"
       purge="False">
-    <value key="last_compilation">2018-07-10 00:00:00</value>
+    <value key="last_compilation">2018-09-06 00:00:00</value>
   </records>
   <records
       prefix="plone.bundles/plone-logged-in"
       interface="Products.CMFPlone.interfaces.IBundleRegistry"
       purge="False">
-    <value key="last_compilation">2018-07-10 00:00:00</value>
+    <value key="last_compilation">2018-09-06 00:00:00</value>
   </records>
 
 </registry>

plone/app/upgrade/v51/profiles/to_514/skins.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<object name="portal_skins">
+  <object
+      name="plone_ecmascript"
+      meta_type="Filesystem Directory View"
+      directory="Products.CMFPlone:skins/plone_ecmascript"
+      remove="True"/>
+  <skin-path name="*">
+    <layer name="plone_ecmascript" remove="True"/>
+  </skin-path>
+</object>