diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-10-29 12:27:14 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-10-29 12:27:14 +0100 |
| commit | 1916fdc1d00a1376c351aa5d62de37abb326bc9c (patch) | |
| tree | d0b61b314efef22b8364b85e4073df354caa07c2 /addons/mail/static/src/xml/thread.xml | |
| parent | 29e36457b29b9f8e919f58d246f734f44d8752b4 (diff) | |
| parent | ac08e2ba53297b303c00be25ba46af3e727db625 (diff) | |
[MERGE] forward port branch 10.0 up to ac08e2ba532
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 b9579be0790..5ec1d754100 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -121,6 +121,7 @@ t-att-data-message-id="message.id" title="Mark as Read"/> </span> </p> + <t t-raw="message.body"/> <t t-if="message.tracking_value_ids && message.tracking_value_ids.length > 0"> <t t-if="message.subtype_description"> <p t-esc="message.subtype_description"/> @@ -128,9 +129,6 @@ <t t-call="mail.ChatThread.MessageTracking"/> </t> <p t-if="options.display_subject && message.display_subject" class="o_mail_subject">Subject: <t t-esc="message.subject"/></p> - <t t-if="!(message.tracking_value_ids && 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> |