[FIX] mail: display both tracking values and body of the messages in mail thread

Before that, the body of the message was never displayed if the message had tracking values. This was annoying for account_asset module, were we prompt the user for some justification when she modifies the depreciation data of an asset, and then call message_post with this text as body, and tracking values reflecting the change that was made.
This commit is contained in:
Olivier Colson
2018-10-26 11:37:52 +02:00
parent 9647620a91
commit ac08e2ba53
+1 -3
View File
@@ -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 &amp;&amp; message.tracking_value_ids.length &gt; 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 &amp;&amp; message.display_subject" class="o_mail_subject">Subject: <t t-esc="message.subject"/></p>
<t t-if="!(message.tracking_value_ids &amp;&amp; message.tracking_value_ids.length &gt; 0)">
<t t-raw="message.body"/>
</t>
<t t-foreach="message.attachment_ids" t-as="attachment">
<t t-call="mail.Attachment"/>
</t>