Move changed registry records to the proper upgrade profile

plone · Feb 6, 2019 · fed7d8f · fed7d8f
1 parent f4d8542
commit fed7d8f
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 44 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -37,7 +37,6 @@ Bug fixes:
 New features:
 
 
-- Add upgrade steps for PLIP 1653 - restructure static resources. [thet] (#184)
 - Add upgrade steps for Datatables on Plone 5.1.4. [frapell] (#168)
 - Add upgrade step removing the jquery-highlightsearchterms resource and the
   plone_ecmascript skin layer, on Plone 5.2 and 5.1.4 [sunew] (#170)

diff --git a/plone/app/upgrade/v52/profiles/to_alpha1/registry.xml b/plone/app/upgrade/v52/profiles/to_alpha1/registry.xml
@@ -26,54 +26,17 @@
       purge="False">
     <value key="last_compilation">2018-09-16 16:00:00</value>
   </records>
+  <records
+      prefix="plone.bundles/thememapper"
+      interface='Products.CMFPlone.interfaces.IBundleRegistry'
+      purge="False">
+    <value key="last_compilation">2018-09-16 16:00:00</value>
+  </records>
 
   <!-- Update legacy bundle -->
   <records prefix="plone.bundles/plone-legacy"
             interface='Products.CMFPlone.interfaces.IBundleRegistry'>
     <value key="last_compilation"></value>
   </records>
 
-
-  <!-- changes from PLIP 1653 - restructure static resources -->
-  <records remove="True" prefix="plone.resources/expect" interface='Products.CMFPlone.interfaces.IResourceRegistry'/>
-  <records remove="True" prefix="plone.resources/js-shortcuts" interface='Products.CMFPlone.interfaces.IResourceRegistry'/>
-  <records remove="True" prefix="plone.resources/marked" interface='Products.CMFPlone.interfaces.IResourceRegistry'/>
-  <records remove="True" prefix="plone.resources/rjs" interface='Products.CMFPlone.interfaces.IResourceRegistry'/>
-  <records remove="True" prefix="plone.resources/react" interface='Products.CMFPlone.interfaces.IResourceRegistry'/>
-  <records remove="True" prefix="plone.resources/JSXTransformer" interface='Products.CMFPlone.interfaces.IResourceRegistry'/>
-  <records remove="True" prefix="plone.resources/sinon" interface='Products.CMFPlone.interfaces.IResourceRegistry'/>
-
-  <records
-      prefix="plone.resources/plone-patterns-toolbar"
-      interface='Products.CMFPlone.interfaces.IResourceRegistry'
-      purge="False">
-    <value key="js">++resource++mockup/toolbar/pattern.js</value>
-    <value key="css">
-      <element>++resource++mockup/toolbar/pattern.toolbar.less</element>
-    </value>
-  </records>
-
-  <records
-      prefix="plone.resources/thememapper"
-      interface='Products.CMFPlone.interfaces.IResourceRegistry'
-      purge="False">
-    <value key="js">++plone++static/thememapper.js</value>
-    <value key="css">
-      <element>++plone++static/thememapper.less</element>
-    </value>
-  </records>
-
-  <records
-      prefix="plone.bundles/thememapper"
-      interface='Products.CMFPlone.interfaces.IBundleRegistry'
-      purge="False">
-    <value key="resources">
-      <element>thememapper</element>
-    </value>
-    <value key="enabled">False</value>
-    <value key="jscompilation">++plone++static/thememapper-compiled.min.js</value>
-    <value key="csscompilation">++plone++static/thememapper-compiled.css</value>
-    <value key="last_compilation">2018-10-01 23:00:00</value>
-  </records>
-
 </registry>
diff --git a/plone/app/upgrade/v52/profiles/to_beta1/registry.xml b/plone/app/upgrade/v52/profiles/to_beta1/registry.xml
@@ -5,4 +5,46 @@
     <value key="navigation_depth">1</value>
   </records>
 
+  <!-- changes from PLIP 1653 - restructure static resources -->
+  <records remove="True" prefix="plone.resources/expect" interface='Products.CMFPlone.interfaces.IResourceRegistry'/>
+  <records remove="True" prefix="plone.resources/js-shortcuts" interface='Products.CMFPlone.interfaces.IResourceRegistry'/>
+  <records remove="True" prefix="plone.resources/marked" interface='Products.CMFPlone.interfaces.IResourceRegistry'/>
+  <records remove="True" prefix="plone.resources/rjs" interface='Products.CMFPlone.interfaces.IResourceRegistry'/>
+  <records remove="True" prefix="plone.resources/react" interface='Products.CMFPlone.interfaces.IResourceRegistry'/>
+  <records remove="True" prefix="plone.resources/JSXTransformer" interface='Products.CMFPlone.interfaces.IResourceRegistry'/>
+  <records remove="True" prefix="plone.resources/sinon" interface='Products.CMFPlone.interfaces.IResourceRegistry'/>
+
+  <records
+      prefix="plone.resources/plone-patterns-toolbar"
+      interface='Products.CMFPlone.interfaces.IResourceRegistry'
+      purge="False">
+    <value key="js">++resource++mockup/toolbar/pattern.js</value>
+    <value key="css">
+      <element>++resource++mockup/toolbar/pattern.toolbar.less</element>
+    </value>
+  </records>
+
+  <records
+      prefix="plone.resources/thememapper"
+      interface='Products.CMFPlone.interfaces.IResourceRegistry'
+      purge="False">
+    <value key="js">++plone++static/thememapper.js</value>
+    <value key="css">
+      <element>++plone++static/thememapper.less</element>
+    </value>
+  </records>
+
+  <records
+      prefix="plone.bundles/thememapper"
+      interface='Products.CMFPlone.interfaces.IBundleRegistry'
+      purge="False">
+    <value key="resources">
+      <element>thememapper</element>
+    </value>
+    <value key="enabled">False</value>
+    <value key="jscompilation">++plone++static/thememapper-compiled.min.js</value>
+    <value key="csscompilation">++plone++static/thememapper-compiled.css</value>
+    <value key="last_compilation">2018-10-01 23:00:00</value>
+  </records>
+
 </registry>