Fix issue where empty value for JS bundle broke Plone bundle merge

collective · Nov 8, 2016 · 07ac100 · 07ac100
1 parent f50d6f1
commit 07ac100
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,8 +4,9 @@ Changelog
 2.0.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
-
+- Fix issue where empty value for JS bundle broke Plone bundle merge
+  on a new site
+  [datakurre]
 
 2.0.0 (2016-11-04)
 ------------------

diff --git a/src/collective/roster/browser/static/bundle.js b/src/collective/roster/browser/static/bundle.js
diff --git a/src/collective/roster/profiles/default/metadata.xml b/src/collective/roster/profiles/default/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>16</version>
+  <version>17</version>
   <dependencies>
     <dependency>profile-plone.app.dexterity:default</dependency>
   </dependencies>

diff --git a/src/collective/roster/profiles/default/registry.xml b/src/collective/roster/profiles/default/registry.xml
@@ -5,6 +5,7 @@
            interface="Products.CMFPlone.interfaces.IBundleRegistry"
            condition="have plone-5">
     <value key="depends">plone</value>
+    <value key="jscompilation">++resource++collective.roster/bundle.js</value>
     <value key="csscompilation">++resource++collective.roster/bundle.css</value>
     <value key="merge_with">default</value>
     <value key="compile">False</value>

diff --git a/src/collective/roster/upgrades.zcml b/src/collective/roster/upgrades.zcml
@@ -173,4 +173,15 @@
       run_deps="false"
       />
 
+  <genericsetup:upgradeDepends
+      source="16" destination="17" sortkey="16"
+      title="Upgrade collective.roster (16 to 17)"
+      description="Register resource bundles for Plone 5"
+      profile="collective.roster:default"
+      import_profile="collective.roster:default"
+      import_steps="plone.app.registry"
+      purge="false"
+      run_deps="false"
+      />
+
 </configure>