From fba3f1bfc7315bdd13eb105769b8ef0ecdd72518 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 17 May 2011 11:35:03 +0200
Subject: [PATCH] [IMP] better use underscore methods, don't subscript a
 1-character string to get its first character (that's an identity function)

bzr revid: xmo@openerp.com-20110517093503-9kb6newmr7q30z4f
---
 addons/base/static/src/js/form.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index dc631c1256a..deed1c526d0 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -321,7 +321,7 @@ openerp.base.form.compute_domain = function(expr, fields) {
         var ex = expr[i];
         if (ex.length == 1) {
             var top = stack.pop();
-            switch (ex[0]) {
+            switch (ex) {
                 case '|':
                     stack.push(stack.pop() || top);
                     continue;
@@ -332,7 +332,7 @@ openerp.base.form.compute_domain = function(expr, fields) {
                     stack.push(!top);
                     continue;
                 default:
-                    throw new Error('Unknown domain operator ' + ex[0]);
+                    throw new Error('Unknown domain operator ' + ex);
             }
         }
 
@@ -362,17 +362,17 @@ openerp.base.form.compute_domain = function(expr, fields) {
                 stack.push(field >= val);
                 break;
             case 'in':
-                stack.push(_.indexOf(val, field) > -1);
+                stack.push(_(val).contains(field));
                 break;
             case 'not in':
-                stack.push(_.indexOf(val, field) == -1);
+                stack.push(!_(val).contains(field));
                 break;
             default:
                 this.log("Unsupported operator in attrs :", op);
         }
     }
-    return _.indexOf(stack, false) == -1;
-}
+    return _.all(stack);
+};
 
 openerp.base.form.Widget = openerp.base.Controller.extend({
     init: function(view, node) {