[MERGE] callback2deferred dataset.name_get

bzr revid: al@openerp.com-20120930150329-b3j0pmnf7gnxlxzj

4 files changed, 8 insertions, 12 deletions

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index a26664f2203..a9a06400357 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -636,8 +636,7 @@ instance.web.DataSet =  instance.web.CallbackEnabled.extend({
      * @returns {$.Deferred}
      */
     create: function(data) {
-        return this._model.call('create',
-            [data], {context: this._model.context()})
+        return this._model.call('create', [data], {context: this._model.context()})
                 .pipe(function (r) { return {result: r}; });
     },
     /**
@@ -718,10 +717,8 @@ instance.web.DataSet =  instance.web.CallbackEnabled.extend({
      * @param {Function} callback
      * @returns {$.Deferred}
      */
-    name_get: function(ids, callback) {
-        return this._model.call('name_get',
-            [ids], {context: this._model.context()})
-                .then(callback);
+    name_get: function(ids) {
+        return this._model.call('name_get', [ids], {context: this._model.context()});
     },
     /**
      * 
@@ -746,8 +743,7 @@ instance.web.DataSet =  instance.web.CallbackEnabled.extend({
      * @param callback
      */
     name_create: function(name) {
-        return this._model.call('name_create',
-            [name], {context: this._model.context()});
+        return this._model.call('name_create', [name], {context: this._model.context()});
     },
     exec_workflow: function (id, signal) {
         return this._model.exec_workflow(id, signal)
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 90c6f51513c..01bc0c76c87 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1499,7 +1499,7 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
             // to handle this as if it were a single value.
             value = value[0];
         }
-        return this.model.call('name_get', [value], {}).pipe(function (names) {
+        return this.model.call('name_get', [value]).pipe(function (names) {
             if (_(names).isEmpty()) { return null; }
             return facet_from(self, names[0]);
         })
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e3d227c2e3c..8423749189a 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3040,7 +3040,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         }
         if (! no_recurse) {
             var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context());
-            dataset.name_get([self.get("value")], function(data) {
+            dataset.name_get([self.get("value")]).then(function(data) {
                 self.display_value["" + self.get("value")] = data[0][1];
                 self.render_value(true);
             });
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 4affa237956..fd34ffddb7b 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -989,7 +989,7 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
                 // to get a correctly displayable value in the field
                 var model = ref_match[1],
                     id = parseInt(ref_match[2], 10);
-                new instance.web.DataSet(this.view, model).name_get([id], function(names) {
+                new instance.web.DataSet(this.view, model).name_get([id]).then(function(names) {
                     if (!names.length) { return; }
                     record.set(column.id, names[0][1]);
                 });
@@ -1005,7 +1005,7 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
                 // and let the various registered events handle refreshing the
                 // row
                 new instance.web.DataSet(this.view, column.relation)
-                        .name_get([value], function (names) {
+                        .name_get([value]).then(function (names) {
                     if (!names.length) { return; }
                     record.set(column.id, names[0]);
                 });