diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2012-10-29 14:41:20 +0100 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2012-10-29 14:41:20 +0100 |
| commit | f561d7e9fda58e7560deec82e41763dd04e7b969 (patch) | |
| tree | 89cc82d20a6b7abcd40e8ac724b19006f3a38eb5 /addons/web/static/src/js/coresetup.js | |
| parent | 17ffcc059706225accdfe7232d7925f8e53f8042 (diff) | |
| parent | 6c9137021cae4550c48e0d9fb44b1f92f42c1b6f (diff) | |
[MERGE] from trunk
bzr revid: fva@openerp.com-20121029105126-gmc4b88e4ggon2l7
bzr revid: fva@openerp.com-20121029134120-7ipcitjtwhgzaqeu
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 |