pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] asset debug shall bypass cache

Browse Source 
bzr revid: fme@openerp.com-20140422112732-1p94f77ymusmsan2
This commit is contained in:
Fabien Meghazi
2014-04-22 13:27:32 +02:00
parent 1cde3cb02b
commit d2f51a75d5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/ir/ir_qweb.py
+6 -6
View File
@@ -1012,10 +1012,10 @@ class AssetsBundle(object):
key = 'js_' + self.checksum
if key not in self.cache:
content =';\n'.join(asset.minify() for asset in self.javascripts)
if self.debug:
content = "/*\n%s\n*/\n" % '\n'.join(
[asset.filename for asset in self.javascripts if asset.filename]) + content
self.cache[key] = content
if self.debug:
return "/*\n%s\n*/\n" % '\n'.join(
[asset.filename for asset in self.javascripts if asset.filename]) + self.cache[key]
return self.cache[key]
def css(self):
@@ -1032,10 +1032,10 @@ class AssetsBundle(object):
matches.append(content)
content = u'\n'.join(matches)
if self.debug:
content = "/*\n%s\n*/\n" % '\n'.join(
[asset.filename for asset in self.javascripts if asset.filename]) + content
self.cache[key] = content
if self.debug:
return "/*\n%s\n*/\n" % '\n'.join(
[asset.filename for asset in self.javascripts if asset.filename]) + self.cache[key]
return self.cache[key]
class WebAsset(object):