[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.

7 files changed, 72 insertions, 71 deletions

diff --git a/addons/mail/static/src/js/activity.js b/addons/mail/static/src/js/activity.js
index d1afae2e675..a61aea9a982 100644
--- a/addons/mail/static/src/js/activity.js
+++ b/addons/mail/static/src/js/activity.js
@@ -52,7 +52,7 @@ var AbstractActivityField = AbstractField.extend({
 
     // private
     _markActivityDone: function (id) {
-        return this.rpc('mail.activity', 'action_done')
+        return this._rpc('mail.activity', 'action_done')
             .args([[id]])
             .exec();
     },
@@ -61,7 +61,7 @@ var AbstractActivityField = AbstractField.extend({
         var missing_ids = _.difference(this.value.res_ids, _.pluck(this.activities, 'id'));
         var fetch_def;
         if (missing_ids.length) {
-            fetch_def = this.rpc('mail.activity', 'read')
+            fetch_def = this._rpc('mail.activity', 'read')
                 .args([missing_ids])
                 .exec();
         }
@@ -168,7 +168,7 @@ var Activity = AbstractActivityField.extend({
     _onUnlinkActivity: function (event) {
         event.preventDefault();
         var activity_id = $(event.currentTarget).data('activity-id');
-        return this.rpc('mail.activity', 'unlink')
+        return this._rpc('mail.activity', 'unlink')
             .args([[activity_id]])
             .exec()
             .then(this._reload.bind(this, {activity: true}));
diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js
index 4a30bac6ca4..9c60851cc22 100644
--- a/addons/mail/static/src/js/chat_manager.js
+++ b/addons/mail/static/src/js/chat_manager.js
@@ -611,9 +611,9 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
         bus.on('notification', null, on_notification);
 
         this.channel_seen = _.throttle(function (channel) {
-            return self.rpc('mail.channel', 'channel_seen')
+            return self._rpc('mail.channel', 'channel_seen')
                 .args([[channel.id]])
-                .exec({shadow: true});
+                .exec({options: {shadow: true}});
         }, 3000);
     },
 
@@ -676,7 +676,7 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
             domain = [['id', '<', min_message_id]].concat(domain);
         }
 
-        return this.rpc('mail.message', 'message_fetch')
+        return this._rpc('mail.message', 'message_fetch')
             .args([domain])
             .kwargs({limit: LIMIT, context: session.user_context})
             .exec()
@@ -704,7 +704,7 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
         if (options.force_fetch || _.difference(ids.slice(0, LIMIT), loaded_msg_ids).length) {
             var ids_to_load = _.difference(ids, loaded_msg_ids).slice(0, LIMIT);
 
-            return this.rpc('mail.message', 'message_format')
+            return this._rpc('mail.message', 'message_format')
                 .args([ids_to_load])
                 .kwargs({context: session.user_context})
                 .exec()
@@ -743,7 +743,7 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
         }
         if ('channel_id' in options) {
             // post a message in a channel or execute a command
-            return this.rpc('mail.channel', data.command ? 'execute_command' : 'message_post')
+            return this._rpc('mail.channel', data.command ? 'execute_command' : 'message_post')
                 .args([options.channel_id])
                 .kwargs(_.extend(msg, {
                     message_type: 'comment',
@@ -763,12 +763,12 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
                 subtype_id: data.subtype_id,
             });
 
-            return this.rpc(options.model, 'message_post')
+            return this._rpc(options.model, 'message_post')
                 .args([options.res_id])
                 .kwargs(msg)
                 .exec()
                 .then(function (msg_id) {
-                    return self.rpc('mail.message', 'message_format')
+                    return self._rpc('mail.message', 'message_format')
                         .args([msg_id])
                         .exec()
                         .then(function (msgs) {
@@ -812,7 +812,7 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
             // get messages for a chatter, when it doesn't know the ids (use
             // case is when using the full composer)
             var domain = [['model', '=', options.model], ['res_id', '=', options.res_id]];
-            this.rpc('mail.message', 'message_fetch')
+            this._rpc('mail.message', 'message_fetch')
                 .args([domain])
                 .kwargs({limit: 30})
                 .exec()
@@ -822,12 +822,12 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
         }
     },
     toggle_star_status: function (message_id) {
-        return this.rpc('mail.message', 'toggle_message_starred')
+        return this._rpc('mail.message', 'toggle_message_starred')
             .args([[message_id]])
             .exec();
     },
     unstar_all: function () {
-        return this.rpc('mail.message', 'unstar_all')
+        return this._rpc('mail.message', 'unstar_all')
             .args([[]])
             .exec();
     },
@@ -838,7 +838,7 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
             return !message || message.is_needaction;
         });
         if (ids.length) {
-            return this.rpc('mail.message', 'set_message_done')
+            return this._rpc('mail.message', 'set_message_done')
                 .args([ids])
                 .exec();
         } else {
@@ -847,14 +847,14 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
     },
     mark_all_as_read: function (channel, domain) {
         if ((channel.id === "channel_inbox" && needaction_counter) || (channel && channel.needaction_counter)) {
-            return this.rpc('mail.message', 'mark_all_as_read')
+            return this._rpc('mail.message', 'mark_all_as_read')
                 .kwargs({channel_ids: channel.id !== "channel_inbox" ? [channel.id] : [], domain: domain})
                 .exec();
         }
         return $.when();
     },
     undo_mark_as_read: function (message_ids, channel) {
-        return this.rpc('mail.message', 'mark_as_unread')
+        return this._rpc('mail.message', 'mark_as_unread')
             .args([message_ids, [channel.id]])
             .exec();
     },
@@ -886,9 +886,9 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
             return mention_partner_suggestions;
         }
         if (!channel.members_deferred) {
-            channel.members_deferred = this.rpc('mail.channel', "channel_fetch_listeners")
+            channel.members_deferred = this._rpc('mail.channel', "channel_fetch_listeners")
                 .args([channel.uuid])
-                .exec({shadow: true})
+                .exec({options: {shadow: true}})
                 .then(function (members) {
                     var suggestions = [];
                     _.each(mention_partner_suggestions, function (partners) {
@@ -949,9 +949,9 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
     },
 
     detach_channel: function (channel) {
-        return this.rpc('mail.channel', "channel_minimize")
+        return this._rpc('mail.channel', "channel_minimize")
             .args([channel.uuid, true])
-            .exec({shadow: true});
+            .exec({options: {shadow: true}});
     },
     remove_chatter_messages: function (model) {
         messages = _.reject(messages, function (message) {
@@ -963,7 +963,7 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
         var method = type === "dm" ? "channel_get" : "channel_create";
         var args = type === "dm" ? [[name]] : [name, type];
 
-        return this.rpc('mail.channel', method)
+        return this._rpc('mail.channel', method)
             .args(args)
             .exec()
             .then(add_channel);
@@ -978,7 +978,7 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
             // channel already joined
             channel_defs[channel_id] = $.when(channel);
         } else {
-            channel_defs[channel_id] = this.rpc('mail.channel', 'channel_join_and_get_info')
+            channel_defs[channel_id] = this._rpc('mail.channel', 'channel_join_and_get_info')
                 .args([[channel_id]])
                 .exec()
                 .then(function (result) {
@@ -988,7 +988,7 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
         return channel_defs[channel_id];
     },
     open_and_detach_dm: function (partner_id) {
-        return this.rpc('mail.channel', 'channel_get_and_minimize')
+        return this._rpc('mail.channel', 'channel_get_and_minimize')
             .args([[partner_id]])
             .exec()
             .then(add_channel);
@@ -999,20 +999,20 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
 
     unsubscribe: function (channel) {
         if (_.contains(['public', 'private'], channel.type)) {
-            return this.rpc('mail.channel', 'action_unfollow')
+            return this._rpc('mail.channel', 'action_unfollow')
                 .args([[channel.id]])
                 .exec();
         } else {
-            return this.rpc('mail.channel', 'channel_pin')
+            return this._rpc('mail.channel', 'channel_pin')
                 .args([channel.uuid, false])
                 .exec();
         }
     },
     close_chat_session: function (channel_id) {
         var channel = this.get_channel(channel_id);
-        this.rpc('mail.channel', "channel_fold")
+        this._rpc('mail.channel', "channel_fold")
             .kwargs({uuid : channel.uuid, state : "closed"})
-            .exec({shadow: true});
+            .exec({options: {shadow: true}});
     },
     fold_channel: function (channel_id, folded) {
         var args = {
@@ -1021,9 +1021,9 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
         if (_.isBoolean(folded)) {
             args.state = folded ? 'folded' : 'open';
         }
-        return this.rpc('mail.channel', "channel_fold")
+        return this._rpc('mail.channel', "channel_fold")
             .kwargs(args)
-            .exec({shadow: true});
+            .exec({options: {shadow: true}});
     },
     /**
      * Special redirection handling for given model and id
@@ -1046,7 +1046,7 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
         };
         if (res_model === "res.partner") {
             var domain = [["partner_id", "=", res_id]];
-            this.rpc('res.users', "search")
+            this._rpc('res.users', "search")
                 .args([domain])
                 .exec()
                 .then(function (user_ids) {
@@ -1057,7 +1057,7 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
                     }
                 });
         } else {
-            this.rpc(res_model, 'get_formview_id')
+            this._rpc(res_model, 'get_formview_id')
                 .args([[res_id], session.user_context])
                 .exec()
                 .then(function (view_id) {
@@ -1083,9 +1083,9 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
         if (!channels_preview_def) {
             if (missing_channels.length) {
                 var missing_channel_ids = _.pluck(missing_channels, 'id');
-                channels_preview_def = this.rpc('mail.channel', 'channel_fetch_preview')
+                channels_preview_def = this._rpc('mail.channel', 'channel_fetch_preview')
                     .args([missing_channel_ids])
-                    .exec({shadow: true});
+                    .exec({options: {shadow: true}});
             } else {
                 channels_preview_def = $.when();
             }
@@ -1120,9 +1120,9 @@ var ChatManager =  Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
         });
         if (!values.length) {
             // extend the research to all users
-            def = this.rpc('res.partner', 'im_search')
+            def = this._rpc('res.partner', 'im_search')
                 .args([search_val, limit || 20])
-                .exec({shadow: true});
+                .exec({options: {shadow: true}});
         } else {
             def = $.when(values);
         }
diff --git a/addons/mail/static/src/js/chatter.js b/addons/mail/static/src/js/chatter.js
index 67f29ab1bbb..a6a04884f76 100644
--- a/addons/mail/static/src/js/chatter.js
+++ b/addons/mail/static/src/js/chatter.js
@@ -245,7 +245,7 @@ var Chatter = Widget.extend(chat_mixin, {
             this.suggested_partners_def = $.Deferred();
             var method = 'message_get_suggested_recipients';
             var args = [[this.context.default_res_id], this.context];
-            this.rpc(this.record.model, method)
+            this._rpc(this.record.model, method)
                 .args(args)
                 .exec()
                 .then(function (result) {
diff --git a/addons/mail/static/src/js/chatter_composer.js b/addons/mail/static/src/js/chatter_composer.js
index 4e7eb6a14ec..8f64622e209 100644
--- a/addons/mail/static/src/js/chatter_composer.js
+++ b/addons/mail/static/src/js/chatter_composer.js
@@ -125,7 +125,7 @@ var ChatterComposer = composer.BasicComposer.extend({
         var def;
         if (names_to_find.length > 0) {
             var args = [[this.context.default_res_id], names_to_find];
-            def = this.rpc(this.model, 'message_partner_info_from_emails')
+            def = this._rpc(this.model, 'message_partner_info_from_emails')
                 .args(args)
                 .exec();
         }
@@ -173,7 +173,7 @@ var ChatterComposer = composer.BasicComposer.extend({
                 var def;
                 if (new_names_to_find.length > 0) {
                     var args = [[self.context.default_res_id], new_names_to_find, true];
-                    self.rpc(self.model, 'message_partner_info_from_emails')
+                    self._rpc(self.model, 'message_partner_info_from_emails')
                         .args(args)
                         .exec();
                 }
diff --git a/addons/mail/static/src/js/client_action.js b/addons/mail/static/src/js/client_action.js
index e461161c437..28acb02828d 100644
--- a/addons/mail/static/src/js/client_action.js
+++ b/addons/mail/static/src/js/client_action.js
@@ -69,7 +69,7 @@ var PartnerInviteDialog = Dialog.extend({
         var self = this;
         var data = this.$input.select2('data');
         if(data.length >= 1){
-            return this.rpc('mail.channel', 'channel_invite')
+            return this._rpc('mail.channel', 'channel_invite')
                 .args([this.channel_id])
                 .kwargs({partner_ids: _.pluck(data, 'id')})
                 .exec()
@@ -381,7 +381,7 @@ var ChatAction = Widget.extend(ControlPanelMixin, {
     },
 
     do_search_channel: function(search_val){
-        return this.rpc('mail.channel', 'channel_search_to_join')
+        return this._rpc('mail.channel', 'channel_search_to_join')
             .args([search_val])
             .exec()
             .then(function(result){
diff --git a/addons/mail/static/src/js/composer.js b/addons/mail/static/src/js/composer.js
index b8a25cda7e3..0471f6e8a5b 100644
--- a/addons/mail/static/src/js/composer.js
+++ b/addons/mail/static/src/js/composer.js
@@ -666,7 +666,7 @@ var BasicComposer = Widget.extend(chat_mixin, {
         var def = $.Deferred();
         clearTimeout(this.mention_fetch_timer);
         this.mention_fetch_timer = setTimeout(function () {
-            return self.rpc(model, method)
+            return self._rpc(model, method)
                 .kwargs(kwargs)
                 .exec()
                 .then(function (results) {
diff --git a/addons/mail/static/src/js/followers.js b/addons/mail/static/src/js/followers.js
index 314e874d7a6..7c4529b203e 100644
--- a/addons/mail/static/src/js/followers.js
+++ b/addons/mail/static/src/js/followers.js
@@ -195,8 +195,9 @@ var Followers = AbstractField.extend({
         var missing_ids = _.difference(this.value.res_ids, _.pluck(this.followers, 'id'));
         var def;
         if (missing_ids.length) {
-            var args = { follower_ids: missing_ids, res_model: this.model };
-            def = this.performRPC('/mail/read_followers', args);
+            def = this._rpc('/mail/read_followers')
+                .params({ follower_ids: missing_ids, res_model: this.model })
+                .exec();
         }
         return $.when(def).then(function (results) {
             if (results) {
@@ -219,7 +220,7 @@ var Followers = AbstractField.extend({
             partner_ids: [this.partnerID],
             context: {}, // FIXME
         };
-        this.rpc(this.model, 'message_subscribe')
+        this._rpc(this.model, 'message_subscribe')
             .args([[this.res_id]])
             .kwargs(kwargs)
             .exec()
@@ -242,7 +243,7 @@ var Followers = AbstractField.extend({
                     ids.channel_ids,
                     {}, // FIXME
                 ];
-                self.rpc(self.model, 'message_unsubscribe')
+                self._rpc(self.model, 'message_unsubscribe')
                     .args(args)
                     .exec()
                     .then(self._reload.bind(self));
@@ -286,7 +287,7 @@ var Followers = AbstractField.extend({
             var kwargs = _.extend({}, ids);
             kwargs.subtype_ids = checklist;
             kwargs.context = {}; // FIXME
-            this.rpc(this.model, 'message_subscribe')
+            this._rpc(this.model, 'message_subscribe')
                 .args([[this.res_id]])
                 .kwargs(kwargs)
                 .exec()
@@ -307,32 +308,32 @@ var Followers = AbstractField.extend({
         var self = this;
         var $currentTarget = $(event.currentTarget);
         var follower_id = $currentTarget.data('follower-id'); // id of model mail_follower
-        return this.performRPC('/mail/read_subscription_data', {
-            res_model: this.model,
-            follower_id: follower_id,
-        }).then(function (data) {
-            var res_id = $currentTarget.data('oe-id'); // id of model res_partner or mail_channel
-            var is_channel = $currentTarget.data('oe-model') === 'mail.channel';
-            self.dialog = new Dialog(this, {
-                size: 'medium',
-                title: _t('Edit Subscription of ') + $currentTarget.siblings('a').text(),
-                buttons: [
-                    {
-                        text: _t("Apply"),
-                        classes: 'btn-primary',
-                        click: function () {
-                            self._updateSubscription(event, res_id, is_channel);
+        return this._rpc('/mail/read_subscription_data')
+            .params({res_model: this.model, follower_id: follower_id})
+            .exec()
+            .then(function (data) {
+                var res_id = $currentTarget.data('oe-id'); // id of model res_partner or mail_channel
+                var is_channel = $currentTarget.data('oe-model') === 'mail.channel';
+                self.dialog = new Dialog(this, {
+                    size: 'medium',
+                    title: _t('Edit Subscription of ') + $currentTarget.siblings('a').text(),
+                    buttons: [
+                        {
+                            text: _t("Apply"),
+                            classes: 'btn-primary',
+                            click: function () {
+                                self._updateSubscription(event, res_id, is_channel);
+                            },
+                            close: true
                         },
-                        close: true
-                    },
-                    {
-                        text: _t("Cancel"),
-                        close: true,
-                    },
-                ],
-            }).open();
-            self._displaySubtypes(data, true, is_channel);
-        });
+                        {
+                            text: _t("Cancel"),
+                            close: true,
+                        },
+                    ],
+                }).open();
+                self._displaySubtypes(data, true, is_channel);
+            });
     },
     _onFollowButtonClicked: function () {
         if (!this.is_follower) {