diff options
| author | Fabien Meghazi <fme@openerp.com> | 2012-01-10 16:45:00 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2012-01-10 16:45:00 +0100 |
| commit | 652e845321aaf049b87d05830605d1f41a1d68b3 (patch) | |
| tree | f7092d82ec47cd71f844774efaedb26381e53ddc /addons/web/static/src | |
| parent | 0a08bf26e755a460be65df287552cc540021ddd8 (diff) | |
[IMP] Refactored Dataset#read_ids usage
bzr revid: fme@openerp.com-20120110154500-466y26mkyb947nze
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/view_editor.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_list.js | 15 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_tree.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views.js | 2 |
4 files changed, 11 insertions, 12 deletions
diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 649f324744d..562ae61ea6a 100644 --- 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 1c4911974fe..d4ab3977c76 100644 --- 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 528a31c7869..97ddb717020 100644 --- 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 18119650262..6e144de29d7 100644 --- 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; |
