[Testbot] Plone 5.0 - Python 2.7 - Build # 3489 - Fixed! - 0 failure(s)

jenkins at plone.org jenkins at plone.org
Tue Oct 28 13:57:21 UTC 2014


-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 3489 - Fixed!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-5.0-python-2.7/3489/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: Products.CMFPlone
Branch: refs/heads/master
Date: 2014-10-28T13:24:23Z
Author: Ramon Navarro Bosch (bloodbare) <ramon.nb at gmail.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/2dc8a4540d53801d6c1ea7986ccf75db8b5151fc

Cooking does not work, so lets be conservative

Files changed:
M Products/CMFPlone/resources/browser/cook.py
M Products/CMFPlone/resources/browser/scripts.py
M Products/CMFPlone/resources/browser/styles.py

diff --git a/Products/CMFPlone/resources/browser/cook.py b/Products/CMFPlone/resources/browser/cook.py
index 5c3777d..ce6dcd6 100644
--- a/Products/CMFPlone/resources/browser/cook.py
+++ b/Products/CMFPlone/resources/browser/cook.py
@@ -200,7 +200,6 @@ def cookWhenChangingSettings(context, bundle):
     css_file = ""
     js_file = ""
     siteUrl = getSite().absolute_url()
-
     request = getRequest()
     original_request = request.clone()
     for package in bundle.resources:
diff --git a/Products/CMFPlone/resources/browser/scripts.py b/Products/CMFPlone/resources/browser/scripts.py
index 31ef44e..346317e 100644
--- a/Products/CMFPlone/resources/browser/scripts.py
+++ b/Products/CMFPlone/resources/browser/scripts.py
@@ -9,10 +9,26 @@ class ScriptsView(ResourceView):
     def get_data(self, bundle, result):
         if self.development is False:
             if bundle.compile is False:
+                # Workarround until cooking works
+                resources = self.get_resources()
+                for resource in bundle.resources:
+                    if resource in resources:
+                        script = resources[resource]
+                        if script.js:
+                            url = urlparse(script.js)
+                            if url.netloc == '':
+                                # Local
+                                src = "%s/%s" % (self.portal_url, script.js)
+                            else:
+                                src = "%s" % (script.js)
+
+                            data = {'conditionalcomment': bundle.conditionalcomment,  # noqa
+                                    'src': src}
+                            result.append(data)
                 # Its a legacy css bundle
-                if not bundle.last_compilation or self.last_legacy_import > bundle.last_compilation:
-                    # We need to compile
-                    cookWhenChangingSettings(self.context, bundle)
+                # if not bundle.last_compilation or self.last_legacy_import > bundle.last_compilation:
+                #     # We need to compile
+                #     cookWhenChangingSettings(self.context, bundle)
             if bundle.jscompilation:
                 result.append({
                     'conditionalcomment': bundle.conditionalcomment,
diff --git a/Products/CMFPlone/resources/browser/styles.py b/Products/CMFPlone/resources/browser/styles.py
index e075241..5ce2986 100644
--- a/Products/CMFPlone/resources/browser/styles.py
+++ b/Products/CMFPlone/resources/browser/styles.py
@@ -37,9 +37,16 @@ def get_data(self, bundle, result):
         if self.development is False:
             if bundle.compile is False:
                 # Its a legacy css bundle
-                if not bundle.last_compilation or self.last_legacy_import > bundle.last_compilation:
-                    # We need to compile
-                    cookWhenChangingSettings(self.context, bundle)
+                self.resources = self.get_resources()
+                # The bundle resources
+                for resource in bundle.resources:
+                    if resource in self.resources:        
+                        style = self.resources[resource]
+                        for data in self.get_urls(style, bundle):
+                            result.append(data)
+                # if not bundle.last_compilation or self.last_legacy_import > bundle.last_compilation:
+                #     # We need to compile
+                #     cookWhenChangingSettings(self.context, bundle)
 
             if bundle.csscompilation:
                 result.append({




-------------------------------------------------------------------------------


More information about the Testbot mailing list