diff options
| author | Géry Debongnie <ged@odoo.com> | 2015-11-26 14:57:16 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-11-27 11:47:34 +0100 |
| commit | 2c84cd4181f8601ec21ffd9b7edb4013c141beb7 (patch) | |
| tree | 5fa6b3f61608d7fcae48be42c98577bbbe62fb0b /addons/mail/static/src/js | |
| parent | db8203c27a21acdbcad2cf1c394b6fea3cf13688 (diff) | |
[FIX] mail: various improvements/fixes
- display appropriate message when no results are found in a search
- don't display 'you have been invited' notif when creating private channel
- correctly join when a user was invited in a public channel
- display a message when a user join a channel through an invitation
- don't display subject for message of type notification (still a
mystery why it happens in test.odoo.com for channel of type mailing)
- better heuristic on when to display message subject
- tweak sidebar text color (slightly whiter)
- add ... to the placeholder of the text area in the composer
- invert send and icons for attach/smiley in composer
- don't display 'read less' on expanded messages
- exclude livechat channels from channel mention suggestions
Diffstat (limited to 'addons/mail/static/src/js')
| -rw-r--r-- | addons/mail/static/src/js/chat_manager.js | 6 | ||||
| -rw-r--r-- | addons/mail/static/src/js/client_action.js | 3 | ||||
| -rw-r--r-- | addons/mail/static/src/js/thread.js | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js index 9b89cb88995..e8a2ad3951e 100644 --- a/addons/mail/static/src/js/chat_manager.js +++ b/addons/mail/static/src/js/chat_manager.js @@ -489,10 +489,10 @@ function on_mark_as_unread_notification (data) { } function on_chat_session_notification (chat_session) { - if ((chat_session.channel_type === "channel") && (chat_session.public === "private") && (chat_session.state === "open")) { + if ((chat_session.channel_type === "channel") && (chat_session.state === "open")) { add_channel(chat_session, {autoswitch: false}); - if (!chat_session.is_minimized) { - web_client.do_notify(_t("Private Channel"), _t("You have been invited to: ") + chat_session.name); + if (!chat_session.is_minimized && chat_session.info !== 'creation') { + web_client.do_notify(_t("Invitation"), _t("You have been invited to: ") + chat_session.name); } } // partner specific change (open a detached window for example) diff --git a/addons/mail/static/src/js/client_action.js b/addons/mail/static/src/js/client_action.js index 89afd003126..e4908188122 100644 --- a/addons/mail/static/src/js/client_action.js +++ b/addons/mail/static/src/js/client_action.js @@ -422,6 +422,9 @@ var ChatAction = Widget.extend(ControlPanelMixin, { display_needactions: this.channel.display_needactions, messages_separator_position: this.messages_separator_position, squash_close_messages: this.channel.type !== 'static', + display_empty_channel: !messages.length && !this.domain.length, + display_no_match: !messages.length && this.domain.length, + display_subject: this.channel.mass_mailing || this.channel.id === "channel_inbox", }; }, diff --git a/addons/mail/static/src/js/thread.js b/addons/mail/static/src/js/thread.js index 1f2404dfe47..a1f8fc8a076 100644 --- a/addons/mail/static/src/js/thread.js +++ b/addons/mail/static/src/js/thread.js @@ -77,7 +77,7 @@ var Thread = Widget.extend({ this.$el.html(QWeb.render('mail.ChatThread', { messages: msgs, - options: _.extend({}, this.options, options), + options: options, ORDER: ORDER, })); }, |
