diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-10-29 14:16:45 +0000 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-10-29 14:16:45 +0000 |
| commit | ee0ff262f084ca921c5414f528372e3d971806e3 (patch) | |
| tree | 666f292731ba27486d97b3227e87d27882d4be44 /addons/mail/static/src/xml/thread.xml | |
| parent | c5dc0b2f39aa98c48953e1d1510495687f5e4f39 (diff) | |
| parent | 953dfe92c24ee02bad07ca454d94df16d9f5654c (diff) | |
[MERGE] forward port branch saas-15 up to 953dfe92c24
closes odoo/odoo#28255
Diffstat (limited to 'addons/mail/static/src/xml/thread.xml')
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 180eac17b48..2acb21dc15d 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -212,6 +212,7 @@ </span> </p> <div class="o_thread_message_content"> + <t t-raw="message.body"/> <t t-if="message.tracking_value_ids and message.tracking_value_ids.length > 0"> <t t-if="message.subtype_description"> <p><t t-esc="message.subtype_description"/></p> @@ -219,9 +220,6 @@ <t t-call="mail.ChatThread.MessageTracking"/> </t> <p t-if="options.display_subject and message.display_subject" class="o_mail_subject">Subject: <t t-esc="message.subject"/></p> - <t t-if="!(message.tracking_value_ids and message.tracking_value_ids.length > 0)"> - <t t-raw="message.body"/> - </t> <t t-foreach="message.attachment_ids" t-as="attachment"> <t t-call="mail.Attachment"/> </t> |