diff options
| author | Aaron Bohy <aab@odoo.com> | 2016-01-25 10:56:25 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2016-01-25 15:47:25 +0100 |
| commit | 16a3a4b7fe4ccad4f2e05c19ecc0ddb4694d4911 (patch) | |
| tree | ce8a8398de443eb028877612b433f32ab36abb48 /addons/mail | |
| parent | fc42880da276736992d9cbc20fb423edb16a7d21 (diff) | |
[FIX] im_livechat,mail: various livechat fixes
- prevent concurrent opening of the chat window
- take into account the placeholder value of the livechat session record
- don't send welcome message if empty
Diffstat (limited to 'addons/mail')
| -rw-r--r-- | addons/mail/static/src/js/chat_window.js | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/chat_window.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/static/src/js/chat_window.js b/addons/mail/static/src/js/chat_window.js index 63074b403c9..95ac9dd8897 100644 --- a/addons/mail/static/src/js/chat_window.js +++ b/addons/mail/static/src/js/chat_window.js @@ -24,10 +24,10 @@ return Widget.extend({ this._super(parent); this.title = title; this.channel_id = channel_id; - this.placeholder = _t("Say something"); this.folded = is_folded; this.options = _.defaults(options || {}, { display_stars: true, + placeholder: _t("Say something"), }); this.unread_msgs = unread_msgs || 0; this.is_hidden = false; diff --git a/addons/mail/static/src/xml/chat_window.xml b/addons/mail/static/src/xml/chat_window.xml index f5c7273d832..eb003cd59cd 100644 --- a/addons/mail/static/src/xml/chat_window.xml +++ b/addons/mail/static/src/xml/chat_window.xml @@ -12,7 +12,7 @@ <div class="o_chat_content"> </div> <div class="o_chat_input"> - <input t-att-placeholder="widget.placeholder"/> + <input t-att-placeholder="widget.options.placeholder"/> </div> </div> </t> |