odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REM] query additional params for bundles 

`translatable` has been removed from assets templates, no need for this anymore

bzr revid: fme@openerp.com-20140428124431-3b5rvyejjosftpq3
This commit is contained in:
Fabien Meghazi 2014-04-28 14:44:31 +02:00
parent 4b3212c076
commit 5d13ad7ee8
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openerp/addons/base/ir/ir_qweb.py
View File

@ -416,7 +416,7 @@ class QWeb(orm.AbstractModel):
if qwebcontext.get('debug'):
return content
bundle = AssetsBundle(name, html=content)
return bundle.to_html(query=qwebcontext.get('assets_query'))
return bundle.to_html()
def render_tag_set(self, element, template_attributes, generated_attributes, qwebcontext):
if "value" in template_attributes:
@ -1014,16 +1014,12 @@ 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, query=None, sep='\n'):
def to_html(self, sep='\n'):
response = []
if query:
query = '?' + werkzeug.url_encode(query)
else:
query = ''
if self.stylesheets:
response.append('<link href="/web/css/%s%s" rel="stylesheet"/>' % (self.xmlid, query))
response.append('<link href="/web/css/%s" rel="stylesheet"/>' % self.xmlid)
if self.javascripts:
response.append('<script type="text/javascript" src="/web/js/%s%s"></script>' % (self.xmlid, query))
response.append('<script type="text/javascript" src="/web/js/%s"></script>' % self.xmlid)
response.extend(self.remains)
return sep.join(response)