From f4a37244cac024c8af907f7ead1fae73a2985bdf Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 22 Apr 2014 15:46:13 +0200 Subject: [PATCH] [ADD] query to assets bundle html bzr revid: fme@openerp.com-20140422134613-8652pfbrdso1qoqd --- openerp/addons/base/ir/ir_qweb.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py index f2983df7dd9..a5442dbbcad 100644 --- a/openerp/addons/base/ir/ir_qweb.py +++ b/openerp/addons/base/ir/ir_qweb.py @@ -16,7 +16,7 @@ from urlparse import urlparse import babel import babel.dates -import werkzeug.utils +import werkzeug from PIL import Image import openerp.http @@ -407,7 +407,7 @@ class QWeb(orm.AbstractModel): if qwebcontext.get('debug'): return content bundle = AssetsBundle(name, html=content) - return bundle.to_html() + return bundle.to_html(query=qwebcontext.get('assets_query')) def render_tag_set(self, element, template_attributes, generated_attributes, qwebcontext): if "value" in template_attributes: @@ -983,12 +983,16 @@ class AssetsBundle(object): def can_aggregate(self, url): return not urlparse(url).netloc and not url.startswith(('/web/css', '/web/js')) - def to_html(self, sep='\n'): + def to_html(self, query=None, sep='\n'): response = [] + if query: + query = '?' + werkzeug.url_encode(query) + else: + query = '' if self.stylesheets: - response.append('' % self.xmlid) + response.append('' % (self.xmlid, query)) if self.javascripts: - response.append('' % self.xmlid) + response.append('' % (self.xmlid, query)) response.extend(self.remains) return sep.join(response)