[imp] added compound context and compound domain and implemented correctly context & domain handling in m2o

bzr revid: nicolas.vanhoren@openerp.com-20110617120834-c616130ueklb3rxs

1 files changed, 13 insertions, 2 deletions

diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js
index 2021f13f092..581bd217ba9 100644
--- a/addons/base/static/src/js/data.js
+++ b/addons/base/static/src/js/data.js
@@ -320,13 +320,22 @@ openerp.base.DataSet =  openerp.base.Controller.extend( /** @lends openerp.base.
             args: args || []
         }, callback, error_callback);
     },
+    call_and_eval: function (method, args, domain_id, context_id, callback, error_callback) {
+        return this.rpc('/base/dataset/call', {
+            model: this.model,
+            method: method,
+            domain_id: domain_id || null,
+            context_id: context_id || null,
+            args: args || []
+        }, callback, error_callback);
+    },
     /**
      * Arguments:
      * name='', args=[], operator='ilike', context=None, limit=100
      */
     name_search: function (args, callback, error_callback) {
-        return this.call('name_search',
-            args,
+        return this.call_and_eval('name_search',
+            args, 1, 3,
             callback, error_callback);
     },
     exec_workflow: function (id, signal, callback) {
@@ -443,6 +452,7 @@ openerp.base.CompoundContext = function(source_context) {
 };
 openerp.base.CompoundContext.prototype.add = function(context) {
     this.__contexts.push(context);
+    return this;
 };
 
 openerp.base.CompoundDomain = function(source_domain) {
@@ -457,6 +467,7 @@ openerp.base.CompoundDomain = function(source_domain) {
 };
 openerp.base.CompoundDomain.prototype.add = function(domain) {
     this.__domains.push(domain);
+    return this;
 };
 
 };