diff options
| author | Alexandre Kühn <aku@odoo.com> | 2018-08-17 11:08:27 +0200 |
|---|---|---|
| committer | Alexandre Kühn <aku@odoo.com> | 2018-08-17 16:28:39 +0200 |
| commit | 6d53cd3201d440b045bc54bd7c3a0cb8c4c5f37d (patch) | |
| tree | 1cfc62a17b9406f9eb07edf046ff9762af5532f7 /addons/mail/static/src/js | |
| parent | 11b24b42d30a465740c655fa3efe4e4adec7e264 (diff) | |
[REF] mail,im_livechat,digest: rename 'chat_client_action' to 'Discuss'
Revision on https://github.com/odoo/odoo/commit/02ec09cb1c3e2d7bc7968f40c18f2208d7f3f498#diff-6d76770b1b7cf716d60a4d76a1555c1d
The commit above mostly renamed 'Client Action' to 'Discuss',
but there were some leftovers.
Diffstat (limited to 'addons/mail/static/src/js')
4 files changed, 4 insertions, 4 deletions
diff --git a/addons/mail/static/src/js/discuss.js b/addons/mail/static/src/js/discuss.js index 27ad9f79f91..258b5a32c0a 100644 --- a/addons/mail/static/src/js/discuss.js +++ b/addons/mail/static/src/js/discuss.js @@ -1474,7 +1474,7 @@ var Discuss = AbstractAction.extend(ControlPanelMixin, { }, }); -core.action_registry.add('mail.chat.instant_messaging', Discuss); +core.action_registry.add('mail.discuss', Discuss); return Discuss; diff --git a/addons/mail/static/src/js/systray/systray_messaging_menu.js b/addons/mail/static/src/js/systray/systray_messaging_menu.js index 733d4f88da2..d4b1b078a02 100644 --- a/addons/mail/static/src/js/systray/systray_messaging_menu.js +++ b/addons/mail/static/src/js/systray/systray_messaging_menu.js @@ -113,7 +113,7 @@ var MessagingMenu = Widget.extend({ discussOptions.active_id = channelID; } - this.do_action('mail.mail_channel_action_client_chat', discussOptions) + this.do_action('mail.action_discuss', discussOptions) .then(function () { // we cannot 'go back to previous page' otherwise self.trigger_up('hide_home_menu'); diff --git a/addons/mail/static/src/js/thread_field.js b/addons/mail/static/src/js/thread_field.js index a239481931b..5484fb1aa61 100644 --- a/addons/mail/static/src/js/thread_field.js +++ b/addons/mail/static/src/js/thread_field.js @@ -197,7 +197,7 @@ var ThreadField = AbstractField.extend({ var self = this; this.call('mail_service', 'joinChannel', channelID).then(function () { // Execute Discuss with 'channel' as default channel - self.do_action('mail.mail_channel_action_client_chat', { active_id: channelID }); + self.do_action('mail.action_discuss', { active_id: channelID }); }); }, /** diff --git a/addons/mail/static/src/js/thread_windows/thread_window.js b/addons/mail/static/src/js/thread_windows/thread_window.js index 1d38ee338d3..f0662b531b9 100644 --- a/addons/mail/static/src/js/thread_windows/thread_window.js +++ b/addons/mail/static/src/js/thread_windows/thread_window.js @@ -279,7 +279,7 @@ var ThreadWindow = AbstractThreadWindow.extend({ res_id: this._thread.getDocumentID(), }); } else { - this.do_action('mail.mail_channel_action_client_chat', { + this.do_action('mail.action_discuss', { clear_breadcrumbs: false, active_id: this.hasThread() ? this._getThreadID() : undefined, on_reverse_breadcrumb: function () { |