diff options
| author | Jérome Maes <jem@openerp.com> | 2015-08-10 16:23:44 +0200 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-09-01 20:16:09 +0200 |
| commit | 95b97d1010e2596c8dbe719382c77c6009819afa (patch) | |
| tree | 2a5d3b0400785eab023ec1c7768829482682cf24 /addons/mail/static/src/xml/mail_thread.xml | |
| parent | 1d54858cbdd10dd6fbfbb3edc1e032317e2ba3f6 (diff) | |
[REF] im_livechat : refactoring, make it compatbile with the nw mail module, change reporting sql view (split them in 2), adapt view, ...
Diffstat (limited to 'addons/mail/static/src/xml/mail_thread.xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail_thread.xml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/addons/mail/static/src/xml/mail_thread.xml b/addons/mail/static/src/xml/mail_thread.xml index 7dee5098b3c..88539e87576 100644 --- a/addons/mail/static/src/xml/mail_thread.xml +++ b/addons/mail/static/src/xml/mail_thread.xml @@ -153,14 +153,18 @@ Note by </t> <!-- author : partner or email_from --> - <t t-if="message.author_id"> - <strong class="o_mail_redirect" data-oe-model="res.partner" t-att-data-oe-id="message.author_id[0]"><t t-esc="message.author_id[1]"/></strong> - + <t t-if="message.author_id && message.author_id[1]"> + <strong class="o_mail_redirect" data-oe-model="res.partner" t-att-data-oe-id="message.author_id[0]"><t t-esc="message.author_id[1]"/></strong> </t> - <t t-if="!message.author_id"> - <strong><t t-esc="message.email_from"/></strong> - + <t t-if="message.author_id && !message.author_id[1] && message.email_from"> + <strong><t t-esc="message.email_from"/></strong> </t> + <t t-if="message.author_id && !message.author_id[1] && !message.email_from"> + <strong><t t-esc="widget.options.default_username"/></strong> + </t> + <small t-att-title="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('LLL')"> - <t t-esc="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('hh:mm')"/> + - <t t-esc="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('hh:mm')"/> </small> <t t-if="message.model && (message.model != 'mail.channel') && widget.options.display_document_link"> on <a class="o_mail_redirect" t-att-data-oe-model="message.model" t-att-data-oe-id="message.res_id" href="#"><t t-esc="message.record_name"/></a> |