diff options
| author | Divyesh Makwana (Open ERP) <mdi@tinyerp.com> | 2012-11-02 16:16:28 +0530 |
|---|---|---|
| committer | Divyesh Makwana (Open ERP) <mdi@tinyerp.com> | 2012-11-02 16:16:28 +0530 |
| commit | ede1da0a6437ec6cef0958033be1973d3e1dff60 (patch) | |
| tree | e2b3b38d299529796232d31452913e7a7cd482a1 /addons/web/static/src/js/coresetup.js | |
| parent | abd1258be69748805a6d9d2715392b2ea767e20f (diff) | |
| parent | 378f8fb1e8edb1e85a52c1c3c30af0fd28e64241 (diff) | |
[Merge] Merge with trunk.
bzr revid: mdi@tinyerp.com-20121102104628-qcf3cgpqgecbqml1
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 |