diff options
| author | Aaron Bohy <aab@odoo.com> | 2015-08-31 11:00:26 +0200 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-09-01 21:04:34 +0200 |
| commit | d3df3268a98f2c19ca1897196102b50d7821f73f (patch) | |
| tree | 7c8953db65633c5617a49fe62f49471a3f7a2cc3 /addons | |
| parent | f83f2d97d70cc8f4e5b9845a6138df5f5dd4d8be (diff) | |
[FIX] mail: partner invite dialog
Correctly send a notification on people invite
Also remove useless less rule
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/mail/static/src/js/mail_chat_backend.js | 7 | ||||
| -rw-r--r-- | addons/mail/static/src/less/mail_chat_backend.less | 7 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/mail_chat_backend.xml | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/addons/mail/static/src/js/mail_chat_backend.js b/addons/mail/static/src/js/mail_chat_backend.js index 798024ce751..039107fd2fe 100644 --- a/addons/mail/static/src/js/mail_chat_backend.js +++ b/addons/mail/static/src/js/mail_chat_backend.js @@ -357,13 +357,10 @@ var PartnerInviteDialog = Dialog.extend({ var self = this; var data = this.$partner_invite_input.select2('data'); if(data.length >= 1){ - this.ChannelModel.call('channel_invite', [], {"ids" : [this.channel.id], 'partner_ids': _.pluck(data, 'id')}).then(function(){ + return this.ChannelModel.call('channel_invite', [], {"ids" : [this.channel.id], 'partner_ids': _.pluck(data, 'id')}).then(function(){ var names = _.pluck(data, 'text').join(', '); self.do_notify(_t('New people'), _.str.sprintf(_t('You added <b>%s</b> to the conversation.'), names)); - self.close(); }); - }else{ - self.close(); } }, }); @@ -562,7 +559,7 @@ var ChatMailThread = Widget.extend(mail_thread.MailThreadMixin, ControlPanelMixi }, on_click_button_invite: function(){ new PartnerInviteDialog(this, { - title: _.str.sprintf(_t('Invite people to %s.'), this.get_current_channel_name()), + title: _.str.sprintf(_t('Invite people to %s'), this.get_current_channel_name()), channel: this.channels[this.get('current_channel_id')], }).open(); }, diff --git a/addons/mail/static/src/less/mail_chat_backend.less b/addons/mail/static/src/less/mail_chat_backend.less index d29138bfa0d..fb9b4202115 100644 --- a/addons/mail/static/src/less/mail_chat_backend.less +++ b/addons/mail/static/src/less/mail_chat_backend.less @@ -126,10 +126,3 @@ } } } - -// ------------------------------------------------------------------ -// Other components -// ------------------------------------------------------------------ -.o_mail_chat_partner_invite{ - height: 50px; -} diff --git a/addons/mail/static/src/xml/mail_chat_backend.xml b/addons/mail/static/src/xml/mail_chat_backend.xml index 4e7ec58643f..acbc4b39a33 100644 --- a/addons/mail/static/src/xml/mail_chat_backend.xml +++ b/addons/mail/static/src/xml/mail_chat_backend.xml @@ -22,7 +22,7 @@ <!-- PartnerInviteDialog : content of the dialog --> <t t-name="mail.chat.PartnerInviteDialog"> - <div class="o_mail_chat_partner_invite"> + <div> <input type="text" class="o_mail_chat_partner_invite_input" id="mail_search_partners"/> </div> </t> |