diff options
| author | Jérome Maes <jem@openerp.com> | 2015-08-26 14:31:45 +0200 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2015-09-01 21:04:31 +0200 |
| commit | 223143bd9787055a86083527363dbe3ad1cfaae2 (patch) | |
| tree | 63656ef9e6d103afa5c4d0ed4ababf37b006a7fc /addons/mail/static/src/xml/mail_chat_common.xml | |
| parent | 0d7083f76632cd284dee52aca9c23a6e424f1930 (diff) | |
[FIX] mail_channel, mail : various
mail_channel: call create with mail_create_nosubscribe=True to not subrscribe creator as follower,
since channel is not a mail thread (channel followers make no sense)
mail : adaptation with new chm controller for attachment, and remove author_ avatar from message format
Diffstat (limited to 'addons/mail/static/src/xml/mail_chat_common.xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail_chat_common.xml | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/addons/mail/static/src/xml/mail_chat_common.xml b/addons/mail/static/src/xml/mail_chat_common.xml index 461a6f94d06..61daa42d5b1 100644 --- a/addons/mail/static/src/xml/mail_chat_common.xml +++ b/addons/mail/static/src/xml/mail_chat_common.xml @@ -31,13 +31,11 @@ </div> <div class="o_mail_chat_im_message"> <div class="o_mail_chat_im_message_avatar"> - <t t-if="message.author_avatar"> - <img t-att-src="'data:image/png;base64,' + message.author_avatar" alt="avatar" class="img-responsive img-rounded"/> - </t> - <t t-if="!message.author_avatar"> - <img src="/mail/static/src/img/smiley/avatar.jpg" alt="avatar" class="img-responsive img-rounded"/> - </t> - </div> + <img t-if="message.message_type == 'email' && (!message.author_id || !message.author_id[0]) && message.email_from" src="/mail/static/src/img/email_icon.png" alt="avatar" class="img-responsive img-rounded"/> + <img t-if="message.message_type == 'email' && (message.author_id && message.author_id[0]) && !message.email_from" t-att-src="'/web/image/res.partner/'+message.author_id[0]+'/image_small'" class="img-responsive img-rounded"/> + <img t-if="message.message_type !== 'email' && (message.author_id && message.author_id[0])" t-att-src="'/web/image/res.partner/'+message.author_id[0]+'/image_small'" class="img-responsive img-rounded"/> + <img t-if="message.message_type !== 'email' && (!message.author_id || !message.author_id[0])" src="/mail/static/src/img/smiley/avatar.jpg" class="img-responsive img-rounded"/> + </div> <div class="o_mail_chat_im_message_core"> <!-- author --> <span class="text-muted"> @@ -65,7 +63,7 @@ <div t-attf-class="o_mail_chat_im_message_attachment"> <t t-foreach="message.attachment_ids" t-as="attachment"> <a t-att-href='attachment.url' target="_blank"> - <i t-att-class="attachment.fa_class" t-att-title="attachment.name || attachment.filename"/> + <i t-att-class="attachment.fa_class" t-att-title="'Download ' + (attachment.name || attachment.filename)"/> </a> </t> </div> |