[IMP] Refactored Dataset#read_ids usage

bzr revid: fme@openerp.com-20120110154500-466y26mkyb947nze

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 649f324..562ae61 100644 (file)
--- a/addons/web/static/src/js/view_editor.js
+++ b/addons/web/static/src/js/view_editor.js
@@ -227,7 +227,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
     get_arch: function() {
         var self = this;
         var view_arch_list = [];
-        this.dataset.read_ids([parseInt(self.main_view_id)], ['arch', 'type'], function(arch) {
+        this.dataset.read_ids([parseInt(self.main_view_id)], ['arch', 'type']).then(function(arch) {
             if (arch.length) {
                 var arch_object = self.parse_xml(arch[0].arch, self.main_view_id);
                 self.main_view_type = arch[0].type == 'tree'? 'list': arch[0].type;
@@ -939,7 +939,7 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             controller.do_set_readonly.add_last(function(){
                 action_manager.stop();
                 new_fields_name = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null);
-                new_fields_name.read_ids([controller.datarecord.id], ['name'], function(result) {
+                new_fields_name.read_ids([controller.datarecord.id], ['name']).then(function(result) {
                 self.add_node_dialog.$element.find('select[id=field_value]').append($("<option selected></option>").attr("value", result[0].name).text(result[0].name));
                     _.detect(self.add_widget,function(widget){
                         widget.name == "field_value"? widget.selection.push(result[0].name): false;

diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 1c49119..d4ab397 100644 (file)
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -1007,14 +1007,13 @@ openerp.web.ListView.List = openerp.web.Class.extend( /** @lends openerp.web.Lis
             [record.get('id')],
             _.pluck(_(this.columns).filter(function (r) {
                     return r.tag === 'field';
-                }), 'name'),
-            function (records) {
-                _(records[0]).each(function (value, key) {
-                    record.set(key, value, {silent: true});
-                });
-                record.trigger('change', record);
-            }
-        );
+                }), 'name')
+        ).then(function (records) {
+            _(records[0]).each(function (value, key) {
+                record.set(key, value, {silent: true});
+            });
+            record.trigger('change', record);
+        });
     },
     /**
      * Renders a list record to HTML

diff --git a/addons/web/static/src/js/view_tree.js b/addons/web/static/src/js/view_tree.js
index 528a31c..97ddb71 100644 (file)
--- a/addons/web/static/src/js/view_tree.js
+++ b/addons/web/static/src/js/view_tree.js
@@ -192,7 +192,7 @@ openerp.web.TreeView = openerp.web.View.extend(/** @lends openerp.web.TreeView#
     getdata: function (id, children_ids) {
         var self = this;
 
-        self.dataset.read_ids(children_ids, this.fields_list(), function (records) {
+        self.dataset.read_ids(children_ids, this.fields_list()).then(function(records) {
             _(records).each(function (record) {
                 self.records[record.id] = record;
             });

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 1811965..6e144de 100644 (file)
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -519,7 +519,7 @@ session.web.ViewManagerAction = session.web.ViewManager.extend(/** @lends oepner
                 }
             });
             if (!(self.action.id in self.session.hidden_menutips)) {
-                Users.read_ids([this.session.uid], ['menu_tips'], function(users) {
+                Users.read_ids([this.session.uid], ['menu_tips']).then(function(users) {
                     var user = users[0];
                     if (!(user && user.id === self.session.uid)) {
                         return;

diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index c9b5ab8..961bb9f 100644 (file)
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -171,7 +171,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
         }
     },
     reload_event: function(id) {
-        this.dataset.read_ids([id], _.keys(this.fields), this.on_events_loaded);
+        this.dataset.read_ids([id], _.keys(this.fields)).then(this.on_events_loaded);
     },
     get_color: function(key) {
         if (this.color_map[key]) {

diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index 2ac6c68..c853fa4 100644 (file)
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -373,8 +373,8 @@ openerp.web_dashboard.Widget = openerp.web.View.extend(/** @lends openerp.web_da
     },
     start: function () {
         this._super();
-        return new openerp.web.DataSet(this, 'res.widget').read_ids(
-                [this.widget_id], ['title'], this.on_widget_loaded);
+        var ds = new openerp.web.DataSet(this, 'res.widget');
+        return ds.read_ids([this.widget_id], ['title']).then(this.on_widget_loaded);
     },
     on_widget_loaded: function (widgets) {
         var widget = widgets[0];

diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 00a63f8..add770d 100644 (file)
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -491,7 +491,7 @@ openerp.web_kanban.KanbanRecord = openerp.web.Widget.extend({
     },
     do_reload: function() {
         var self = this;
-        this.view.dataset.read_ids([this.id], this.view.fields_keys, function(records) {
+        this.view.dataset.read_ids([this.id], this.view.fields_keys).then(function(records) {
             if (records.length) {
                 self.set_record(records[0]);
                 self.do_render();