Merge pull request #350 from plone/thet-custombundlefix

custom bundle fix

CHANGES.rst

@@ -8,6 +8,12 @@ Changelog
 5.0b1 (unreleased)
 ------------------
 
+- Fix the resource registry to save the automatically generated filepath to the
+  compiled resource on the bundle object after compilation. The filepath is
+  always in the '++plone++static/' namespace. This fix makes custom bundles
+  actually includable.
+  [thet]
+
 - Get icon from layout_view instead of plone_view.
   [pbauer]
 

Products/CMFPlone/controlpanel/browser/resourceregistry.py

@@ -240,6 +240,7 @@ def save_js_build(self):
         bundle = self.get_bundles().get(req.form['bundle'])
         if bundle:
             bundle.last_compilation = datetime.now()
+            bundle.jscompilation = '++plone++{}'.format(filepath)
         return json.dumps({
             'success': True,
             'filepath': '++plone++' + filepath
@@ -255,6 +256,7 @@ def save_less_build(self):
         bundle = self.get_bundles().get(req.form['bundle'])
         if bundle:
             bundle.last_compilation = datetime.now()
+            bundle.csscompilation = '++plone++{}'.format(filepath)
         return json.dumps({
             'success': True,
             'filepath': '++plone++' + filepath

Products/CMFPlone/resources/viewlets/__init__.py

@@ -1,4 +1,3 @@
-
 from Products.ResourceRegistries.interfaces.registries import IResourceRegistry
 from Products.ResourceRegistries.interfaces.registries import ICSSRegistry
 from Products.ResourceRegistries.interfaces.registries import IKSSRegistry