diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-11-02 10:52:55 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-11-02 10:52:55 +0100 |
| commit | 5e055a2afd23bd4e6a29c18c86d1978dcd98fc9f (patch) | |
| tree | 058c2cef359de70f7bbabacaa63446fa189af12e /addons/mail/static/src | |
| parent | 486777654009aa372a21e9d6dd52e8c22173ee16 (diff) | |
| parent | f6ca72b3ce9ecc9007ae5825d2c648e3b26b098e (diff) | |
[MERGE] forward port branch saas-11.4 up to f6ca72b3ce9
Diffstat (limited to 'addons/mail/static/src')
| -rw-r--r-- | addons/mail/static/src/js/composers/basic_composer.js | 1 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/addons/mail/static/src/js/composers/basic_composer.js b/addons/mail/static/src/js/composers/basic_composer.js index a6cdb39e2de..0e4d62232e2 100644 --- a/addons/mail/static/src/js/composers/basic_composer.js +++ b/addons/mail/static/src/js/composers/basic_composer.js @@ -390,6 +390,7 @@ var BasicComposer = Widget.extend({ return; } + this.$(".o_composer_button_send").prop("disabled", true); clearTimeout(this._cannedTimeout); var self = this; this._preprocessMessage().then(function (message) { diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 83d40bc7af1..e5db4a72524 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -351,6 +351,7 @@ </span> </p> <div class="o_thread_message_content"> + <t t-raw="message.getBody()"/> <t t-if="message.hasTrackingValues()"> <t t-if="message.hasSubtypeDescription()"> <p><t t-esc="message.getSubtypeDescription()"/></p> @@ -358,9 +359,6 @@ <t t-call="mail.widget.Thread.MessageTracking"/> </t> <p t-if="options.displaySubjectOnMessages and message.shouldDisplaySubject()" class="o_mail_subject">Subject: <t t-esc="message.getSubject()"/></p> - <t t-if="!(message.hasTrackingValues())"> - <t t-raw="message.getBody()"/> - </t> <t t-if="message.hasAttachments()"> <div t-if="message.hasImageAttachments()" class="o_attachments_previews"> <t t-foreach="message.getImageAttachments()" t-as="attachment"> |