summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/coresetup.js
diff options
context:
space:
mode:
authorHiral Patel (OpenERP) <hip@tinyerp.com>2012-11-26 17:30:04 +0530
committerHiral Patel (OpenERP) <hip@tinyerp.com>2012-11-26 17:30:04 +0530
commit59ccb3cc3d499f79df268d9c6006ca4beba2d3f5 (patch)
treef197f93792b971ddd8e0b60b0124cd22807b5179 /addons/web/static/src/js/coresetup.js
parent786b11f31dd45b6af61b7a74dc7894ab7914faba (diff)
parent7f9b18dc1d173586dbdcd611bc1f752162ad2a8b (diff)
[MERGE] Merge with lp:openerp-web
bzr revid: hip@tinyerp.com-20121126120004-svopvxi5btx8nawc
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
-rw-r--r--addons/web/static/src/js/coresetup.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 7ddefa301f2..8b12f39c5e4 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -543,12 +543,12 @@ instance.web._lt = function (s) {
return {toString: function () { return instance.web._t(s); }}
};
instance.web.qweb = new QWeb2.Engine();
-instance.web.qweb.default_dict['__debug__'] = instance.session.debug; // Which one ?
instance.web.qweb.debug = instance.session.debug;
instance.web.qweb.default_dict = {
'_' : _,
'_t' : instance.web._t,
'JSON': JSON,
+ '__debug__': instance.session.debug,
};
instance.web.qweb.preprocess_node = function() {
// Note that 'this' is the Qweb Node