diff options
| author | Christophe Matthieu <chm@openerp.com> | 2012-10-26 16:04:12 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2012-10-26 16:04:12 +0200 |
| commit | 415f519cd86ad5ad7085c5ba6f2cb4bd7c353e01 (patch) | |
| tree | 986f0f842c51b52a4dcb16533b8dd52af5a454d3 /addons/web/static/src/js/coresetup.js | |
| parent | 00bfec86ab5222ee8d46f50e57c3003b9a5d1c72 (diff) | |
| parent | 08db8bbf0f015fd710e1ce79a55fb8faf143f6d5 (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20121026140412-wfwl9ze4s8pzs9sg
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
| -rw-r--r-- | addons/web/static/src/js/coresetup.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index 1f1112df2f2..220b9b63d5c 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -530,7 +530,8 @@ instance.web.qweb.default_dict['__debug__'] = instance.session.debug; // Which o instance.web.qweb.debug = instance.session.debug; instance.web.qweb.default_dict = { '_' : _, - '_t' : instance.web._t + '_t' : instance.web._t, + 'JSON': JSON, }; instance.web.qweb.preprocess_node = function() { // Note that 'this' is the Qweb Node |