From d2f51a75d518ea3bd513b091c8b1db2a0c097307 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 22 Apr 2014 13:27:32 +0200 Subject: [PATCH] [FIX] asset debug shall bypass cache bzr revid: fme@openerp.com-20140422112732-1p94f77ymusmsan2 --- openerp/addons/base/ir/ir_qweb.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py index 2c2e396b394..f2983df7dd9 100644 --- a/openerp/addons/base/ir/ir_qweb.py +++ b/openerp/addons/base/ir/ir_qweb.py @@ -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):