From 1fe81f3a962cf1600a9aecbb22d7be9162c3a311 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Wed, 3 Oct 2012 18:04:12 +0530 Subject: [PATCH] [IMP] In rpc method remove callback and modify related code bzr revid: ggh@tinyerp.com-20121003123412-22o4t380ipsmns2e --- .../account/static/src/js/account_move_reconciliation.js | 2 +- addons/auth_openid/static/src/js/auth_openid.js | 4 ++-- addons/board/static/src/js/dashboard.js | 6 +++--- addons/edi/static/src/js/edi.js | 6 +++--- addons/mail/static/src/js/mail.js | 2 +- addons/point_of_sale/static/src/js/devices.js | 7 +++---- addons/process/static/src/js/process.js | 2 +- addons/share/static/src/js/share.js | 2 +- addons/web_shortcuts/static/src/js/web_shortcuts.js | 4 ++-- 9 files changed, 17 insertions(+), 18 deletions(-) diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js index 6b007e2f097..18e415a5f0a 100644 --- a/addons/account/static/src/js/account_move_reconciliation.js +++ b/addons/account/static/src/js/account_move_reconciliation.js @@ -101,7 +101,7 @@ openerp.account = function (instance) { return self.rpc("/web/action/load", { action_id: result[1], context: additional_context - }, function (result) { + }).then(function (result) { result = result.result; result.context = _.extend(result.context || {}, additional_context); result.flags = result.flags || {}; diff --git a/addons/auth_openid/static/src/js/auth_openid.js b/addons/auth_openid/static/src/js/auth_openid.js index 70739e056ed..56ec5b57d3f 100644 --- a/addons/auth_openid/static/src/js/auth_openid.js +++ b/addons/auth_openid/static/src/js/auth_openid.js @@ -69,7 +69,7 @@ instance.web.Login = instance.web.Login.extend({ _check_error: function() { var self = this; if (this.params.loginerror !== undefined) { - this.rpc('/auth_openid/login/status', {}, function(result) { + this.rpc('/auth_openid/login/status', {}).then(function(result) { if (_.contains(['success', 'failure'], result.status) && result.message) { self.do_warn('Invalid OpenID Login', result.message); } @@ -106,7 +106,7 @@ instance.web.Login = instance.web.Login.extend({ do_openid_login: function(db, openid_url) { var self = this; - this.rpc('/auth_openid/login/verify', {'db': db, 'url': openid_url}, function(result) { + this.rpc('/auth_openid/login/verify', {'db': db, 'url': openid_url}).then(function(result) { if (result.error) { self.do_warn(result.title, result.error); return; diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js index 43d7ca76d39..e2d4d6246ab 100644 --- a/addons/board/static/src/js/dashboard.js +++ b/addons/board/static/src/js/dashboard.js @@ -46,7 +46,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ delete(action.attrs.colspan); var action_id = _.str.toNumber(action.attrs.name); if (!_.isNaN(action_id)) { - self.rpc('/web/action/load', {action_id: action_id}, function(result) { + self.rpc('/web/action/load', {action_id: action_id}).then(function(result) { self.on_load_action(result, column_index + '_' + action_index, action.attrs); }); } @@ -81,7 +81,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ this.rpc('/web/view/undo_custom', { view_id: this.view.fields_view.view_id, reset: true - }, this.do_reload); + }).then(this.do_reload); }, on_change_layout: function() { var self = this; @@ -382,7 +382,7 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({ domain: domain, view_mode: view_parent.active_view, name: this.$el.find("input").val() - }, function(r) { + }).then(function(r) { if (r === false) { self.do_warn("Could not add filter to dashboard"); } else { diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js index abb6d9a6232..4089318f3ce 100644 --- a/addons/edi/static/src/js/edi.js +++ b/addons/edi/static/src/js/edi.js @@ -15,7 +15,7 @@ openerp.edi.EdiView = openerp.web.Widget.extend({ this._super(); var self = this; var param = {"db": self.db, "token": self.token}; - return self.rpc('/edi/get_edi_document', param, this.on_document_loaded, this.on_document_failed); + return self.rpc('/edi/get_edi_document', param).done(this.on_document_loaded), fail(this.on_document_failed); }, on_document_loaded: function(docs){ this.doc = docs[0]; @@ -149,11 +149,11 @@ openerp.edi.EdiImport = openerp.web.Widget.extend({ }, do_import: function() { - this.rpc('/edi/import_edi_url', {url: this.url}, this.on_imported, this.on_imported_error); + this.rpc('/edi/import_edi_url', {url: this.url}),done(this.on_imported), fail(this.on_imported_error); }, on_imported: function(response) { if ('action' in response) { - this.rpc("/web/session/save_session_action", {the_action: response.action}, function(key) { + this.rpc("/web/session/save_session_action", {the_action: response.action}).then(function(key) { window.location = "/#sa="+encodeURIComponent(key); }); } diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index e0c9ac9b7fc..0ee3e6b1144 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -1127,7 +1127,7 @@ openerp.mail = function(session) { domains: domains || [], contexts: contexts || [], group_by_seq: groupbys || [] - }, function (results) { + }).then(function (results) { self.search_results['context'] = results.context; self.search_results['domain'] = results.domain; self.thread.destroy(); diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js index 142d35bd340..9b38c7f72f0 100644 --- a/addons/point_of_sale/static/src/js/devices.js +++ b/addons/point_of_sale/static/src/js/devices.js @@ -37,11 +37,10 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal callbacks[i](params); } - this.connection.rpc('/pos/'+name, params || {}, - function(result){ + this.connection.rpc('/pos/'+name, params || {}).done(function(result){ ret.resolve(result); - }, - function(error){ + }), + fail(function(error){ ret.reject(error); }); return ret; diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js index 57c6f196012..b13e92df33c 100644 --- a/addons/process/static/src/js/process.js +++ b/addons/process/static/src/js/process.js @@ -223,7 +223,7 @@ instance.web.ViewManager.include({ self.rpc("/web/action/load", { action_id: action.id, context: dataset.context - }, function(result) { + }).then(function(result) { action_manager.replace(self.$el); action_manager.do_action(result.result); }) diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js index bab3cac243f..83eab6afaf2 100644 --- a/addons/share/static/src/js/share.js +++ b/addons/share/static/src/js/share.js @@ -15,7 +15,7 @@ openerp.share = function(session) { self.rpc('/web/session/eval_domain_and_context', { domains: [domain], contexts: [view.dataset.context] - }, function (result) { + }).then(function (result) { Share.create({ name: action.name, record_name: rec_name, diff --git a/addons/web_shortcuts/static/src/js/web_shortcuts.js b/addons/web_shortcuts/static/src/js/web_shortcuts.js index 743f3fc73aa..06b8fe35f73 100644 --- a/addons/web_shortcuts/static/src/js/web_shortcuts.js +++ b/addons/web_shortcuts/static/src/js/web_shortcuts.js @@ -46,7 +46,7 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({ load: function() { var self = this; this.$el.find('.oe_systray_shortcuts_items').empty(); - return this.rpc('/web/shortcuts/list', {}, function(shortcuts) { + return this.rpc('/web/shortcuts/list', {}).then(function(shortcuts) { _.each(shortcuts, function(sc) { self.trigger('display', sc); }); @@ -80,7 +80,7 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({ id = $link.data('id'); self.session.active_id = id; // TODO: Use do_action({menu_id: id, type: 'ir.actions.menu'}) - self.rpc('/web/menu/action', {'menu_id': id}, function(ir_menu_data) { + self.rpc('/web/menu/action', {'menu_id': id}).then(function(ir_menu_data) { if (ir_menu_data.action.length){ instance.webclient.user_menu.on_action({action_id: ir_menu_data.action[0][2].id}); }