diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-10-29 17:12:53 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-10-29 17:12:53 +0100 |
| commit | 8cf43f13508e23a40aa6972c68e9de0681fe2699 (patch) | |
| tree | fce90997574e6385c5140690d3cf7c93db60c6bd /addons/mail/static/src/xml/thread.xml | |
| parent | 3aa6c94f5bfe841bd3c60554cbde4fd1d06667e3 (diff) | |
| parent | ee0ff262f084ca921c5414f528372e3d971806e3 (diff) | |
[MERGE] forward port branch 11.0 up to ee0ff262f08
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 d13508b7e1b..82ce1011c50 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -197,6 +197,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> @@ -204,9 +205,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-if="message.attachment_ids.length > 0"> <div t-if="message.images.length > 0" class="o_attachments_previews"> <t t-foreach="message.images" t-as="attachment"> |