From 93073dff94904d8b87f2501ee7cde8f6d85a45bb Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 10 Apr 2014 19:40:25 +0200 Subject: [PATCH] [FIX] exclude /web/[css|js] in parsing bzr revid: fme@openerp.com-20140410174025-74hmzzalkxux3tvb --- openerp/addons/base/ir/ir_qweb.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py index 9b0000f3838..85bf9aa9bbf 100644 --- a/openerp/addons/base/ir/ir_qweb.py +++ b/openerp/addons/base/ir/ir_qweb.py @@ -962,11 +962,11 @@ class AssetsBundle(object): href = el.attrib.get('href') if el.tag == 'style': self.stylesheets.append(StylesheetAsset(inline=el.text)) - elif el.tag == 'link' and el.attrib['rel'] == 'stylesheet' and self.is_internal_url(href): + elif el.tag == 'link' and el.attrib['rel'] == 'stylesheet' and self.can_aggregate(href): self.stylesheets.append(StylesheetAsset(url=href)) elif el.tag == 'script' and not src: self.javascripts.append(JavascriptAsset(inline=el.text)) - elif el.tag == 'script' and self.is_internal_url(src): + elif el.tag == 'script' and self.can_aggregate(src): self.javascripts.append(JavascriptAsset(url=src)) else: self.remains.append(lxml.html.tostring(el)) @@ -977,8 +977,8 @@ class AssetsBundle(object): # notYETimplementederror raise NotImplementedError - def is_internal_url(self, url): - return not urlparse(url).netloc + def can_aggregate(self, url): + return not urlparse(url).netloc and not url.startswith('/web/css') and not url.startswith('/web/js') def to_html(self, sep='\n'): response = list(self.remains)