summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/js/thread.js
diff options
context:
space:
mode:
authorGéry Debongnie <ged@odoo.com>2015-11-26 14:57:16 +0100
committerAaron Bohy <aab@odoo.com>2015-11-27 11:47:34 +0100
commit2c84cd4181f8601ec21ffd9b7edb4013c141beb7 (patch)
tree5fa6b3f61608d7fcae48be42c98577bbbe62fb0b /addons/mail/static/src/js/thread.js
parentdb8203c27a21acdbcad2cf1c394b6fea3cf13688 (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/thread.js')
-rw-r--r--addons/mail/static/src/js/thread.js2
1 files changed, 1 insertions, 1 deletions
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,
}));
},