summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/chrome
diff options
context:
space:
mode:
authorGéry Debongnie <ged@odoo.com>2017-03-07 16:14:05 +0100
committerAaron Bohy <aab@odoo.com>2017-04-11 19:44:38 +0200
commit86a87aa8b0dde2237cfe1bb769724e8ed269b62e (patch)
tree472de08242d81d1811c23dbfcd4381a903917d85 /addons/web/static/src/js/chrome
parent78c97e6cc4c90036e68ad8f82b3c7d326b321067 (diff)
[REF] *: use _rpc method for all rpcs
The _rpc method is now the preferred method to do a rpc, so we need to update all calls.
Diffstat (limited to 'addons/web/static/src/js/chrome')
-rw-r--r--addons/web/static/src/js/chrome/action_manager.js28
-rw-r--r--addons/web/static/src/js/chrome/search_inputs.js4
-rw-r--r--addons/web/static/src/js/chrome/sidebar.js35
-rw-r--r--addons/web/static/src/js/chrome/user_menu.js30
-rw-r--r--addons/web/static/src/js/chrome/web_client.js8
5 files changed, 60 insertions, 45 deletions
diff --git a/addons/web/static/src/js/chrome/action_manager.js b/addons/web/static/src/js/chrome/action_manager.js
index 8db4fab8094..fdfc33f74f5 100644
--- a/addons/web/static/src/js/chrome/action_manager.js
+++ b/addons/web/static/src/js/chrome/action_manager.js
@@ -559,11 +559,14 @@ var ActionManager = Widget.extend({
if (warm) {
this.null_action();
}
- action_loaded = this.rpc('/web/session/get_session_action', {key: state.sa}).then(function(action) {
- if (action) {
- return self.do_action(action);
- }
- });
+ action_loaded = this._rpc('/web/session/get_session_action')
+ .params({key: state.sa})
+ .exec()
+ .then(function(action) {
+ if (action) {
+ return self.do_action(action);
+ }
+ });
}
return $.when(action_loaded || null).done(function() {
@@ -832,12 +835,15 @@ var ActionManager = Widget.extend({
},
ir_actions_server: function (action, options) {
var self = this;
- return this.performRPC('/web/action/run', {
- action_id: action.id,
- context: action.context || {}
- }).then(function (action) {
- return self.do_action(action, options);
- });
+ return this._rpc('/web/action/run')
+ .params({
+ action_id: action.id,
+ context: action.context || {}
+ })
+ .exec()
+ .then(function (action) {
+ return self.do_action(action, options);
+ });
},
ir_actions_report_xml: function(action, options) {
var self = this;
diff --git a/addons/web/static/src/js/chrome/search_inputs.js b/addons/web/static/src/js/chrome/search_inputs.js
index 6855520a39b..41676b98e2e 100644
--- a/addons/web/static/src/js/chrome/search_inputs.js
+++ b/addons/web/static/src/js/chrome/search_inputs.js
@@ -426,7 +426,7 @@ var ManyToOneField = CharField.extend({
args = [];
}
}
- return this.rpc(this.attrs.relation, 'name_search')
+ return this._rpc(this.attrs.relation, 'name_search')
.kwargs({
name: needle,
args: args,
@@ -458,7 +458,7 @@ var ManyToOneField = CharField.extend({
}
var context = pyeval.eval('contexts', [this.searchview.dataset.get_context()]);
- return this.rpc(this.attrs.relation, 'name_get')
+ return this._rpc(this.attrs.relation, 'name_get')
.args([value])
.withContext(context)
.exec()
diff --git a/addons/web/static/src/js/chrome/sidebar.js b/addons/web/static/src/js/chrome/sidebar.js
index b57e94e422c..41e45b6e148 100644
--- a/addons/web/static/src/js/chrome/sidebar.js
+++ b/addons/web/static/src/js/chrome/sidebar.js
@@ -148,23 +148,26 @@ var Sidebar = Widget.extend({
new Context(
sidebar_eval_context, active_ids_context));
- self.rpc("/web/action/load", {
- action_id: item.action.id,
- context: new Context(
- dataset.get_context(), active_ids_context).eval()
- }).done(function(result) {
- result.context = new Context(
- result.context || {}, active_ids_context)
- .set_eval_context(c);
- result.flags = result.flags || {};
- result.flags.new_window = true;
- self.do_action(result, {
- on_close: function() {
- // reload view
- self.getParent().reload();
- },
+ self._rpc("/web/action/load")
+ .params({
+ action_id: item.action.id,
+ context: new Context(
+ dataset.get_context(), active_ids_context).eval()
+ })
+ .exec()
+ .done(function(result) {
+ result.context = new Context(
+ result.context || {}, active_ids_context)
+ .set_eval_context(c);
+ result.flags = result.flags || {};
+ result.flags.new_window = true;
+ self.do_action(result, {
+ on_close: function() {
+ // reload view
+ self.getParent().reload();
+ },
+ });
});
- });
});
});
},
diff --git a/addons/web/static/src/js/chrome/user_menu.js b/addons/web/static/src/js/chrome/user_menu.js
index 8a33260432b..21ecac479b1 100644
--- a/addons/web/static/src/js/chrome/user_menu.js
+++ b/addons/web/static/src/js/chrome/user_menu.js
@@ -59,12 +59,15 @@ var UserMenu = Widget.extend({
var self = this;
this.trigger_up('clear_uncommitted_changes', {
callback: function () {
- self.performRPC('/web/session/account').then(function (url) {
- framework.redirect(url);
- }).fail(function (result, ev){
- ev.preventDefault();
- framework.redirect('https://accounts.odoo.com/account');
- });
+ self._rpc('/web/session/account')
+ .exec()
+ .then(function (url) {
+ framework.redirect(url);
+ })
+ .fail(function (result, ev){
+ ev.preventDefault();
+ framework.redirect('https://accounts.odoo.com/account');
+ });
},
});
},
@@ -90,12 +93,15 @@ var UserMenu = Widget.extend({
var session = this.getSession();
this.trigger_up('clear_uncommitted_changes', {
callback: function () {
- self.performRPC("/web/action/load", {
- action_id: "base.action_res_users_my",
- }).done(function (result) {
- result.res_id = session.uid;
- self.do_action(result);
- });
+ self._rpc("/web/action/load")
+ .params({
+ action_id: "base.action_res_users_my",
+ })
+ .exec()
+ .done(function (result) {
+ result.res_id = session.uid;
+ self.do_action(result);
+ });
},
});
},
diff --git a/addons/web/static/src/js/chrome/web_client.js b/addons/web/static/src/js/chrome/web_client.js
index f668676673c..48666e2bd16 100644
--- a/addons/web/static/src/js/chrome/web_client.js
+++ b/addons/web/static/src/js/chrome/web_client.js
@@ -65,12 +65,12 @@ return AbstractWebClient.extend({
logo_edit: function(ev) {
var self = this;
ev.preventDefault();
- this.rpc("res.users", "read")
+ this._rpc("res.users", "read")
.args([[session.uid], ["company_id"]])
.exec()
.then(function(data) {
- self.rpc("/web/action/load")
- .kwargs({ action_id: "base.action_res_company_form" })
+ self._rpc("/web/action/load")
+ .params({ action_id: "base.action_res_company_form" })
.exec()
.done(function(result) {
result.res_id = data[0].company_id[0];
@@ -99,7 +99,7 @@ return AbstractWebClient.extend({
var state = $.bbq.getState(true);
if (_.isEmpty(state) || state.action === "login") {
self.menu.is_bound.done(function() {
- self.rpc("res.users", "read")
+ self._rpc("res.users", "read")
.args([[session.uid], ["action_id"]])
.exec()
.done(function(result) {