[FIX] don't forget to set py.bool in context of py.eval/py.evaluate
authorXavier Morel <xmo@openerp.com>
Mon, 30 Jan 2012 08:55:57 +0000 (09:55 +0100)
committerXavier Morel <xmo@openerp.com>
Mon, 30 Jan 2012 08:55:57 +0000 (09:55 +0100)
py.eval really needs to automatically have builtins in its evaluation context...

lp bug: https://launchpad.net/bugs/922651 fixed

bzr revid: xmo@openerp.com-20120130085557-oqmjs0owgdrwshu0

addons/web/static/src/js/view_list.js
addons/web/static/src/js/view_tree.js

index 9b6710a..f9f845f 100644 (file)
@@ -158,7 +158,7 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView#
             var pair = this.colors[i],
                 color = pair[0],
                 expression = pair[1];
-            if (py.evaluate(expression, context)) {
+            if (py.evaluate(expression, _.extend({bool: py.bool}, context))) {
                 return 'color: ' + color + ';';
             }
             // TODO: handle evaluation errors
index 902b5a9..dea5379 100644 (file)
@@ -146,7 +146,7 @@ openerp.web.TreeView = openerp.web.View.extend(/** @lends openerp.web.TreeView#
             var pair = this.colors[i],
                 color = pair[0],
                 expression = pair[1];
-            if (py.evaluate(expression, context)) {
+            if (py.evaluate(expression, _.extend({bool: py.bool}, context))) {
                 return 'color: ' + color + ';';
             }
             // TODO: handle evaluation errors