summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/corelib.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@openerp.com>2012-10-12 15:05:37 +0200
committerChristophe Simonis <chs@openerp.com>2012-10-12 15:05:37 +0200
commitbc1a3dff21bf7bdb4c67aa1ad5e3bca237d4945c (patch)
tree89dbe96205b02868cc22a6bc479aa5efbf3925cc /addons/web/static/src/js/corelib.js
parent907b9700be95419684b356f0d8b2ec551cf2a713 (diff)
parent40d2a376ca8e6ea7c66ebf77a13b11f48257977e (diff)
merge upstream
bzr revid: chs@openerp.com-20121011152134-5cvm45dzo8sz9pbw bzr revid: chs@openerp.com-20121012130537-phw0ks03s127a3j9
Diffstat (limited to 'addons/web/static/src/js/corelib.js')
-rw-r--r--addons/web/static/src/js/corelib.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index b5fbacc7927..8c38724b1d5 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -1440,6 +1440,10 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({
},
});
+instance.web.py_eval = function(expr, context) {
+ return py.eval(expr, _.extend({}, context || {}, {"true": true, "false": false, "null": null}));
+};
+
}
// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: