diff options
| author | XavierDo <xdo@odoo.com> | 2018-04-27 16:50:03 +0200 |
|---|---|---|
| committer | XavierDo <xdo@odoo.com> | 2018-06-07 11:46:28 +0200 |
| commit | 133eeb1bbf52e9a9ee58f83be8e7f0aba3c6d1ad (patch) | |
| tree | cd7c6b0a3c931705158c9af590206130480426f6 /addons/mail/static/src/xml | |
| parent | aa7fb8c72317e330bbeb6ce29b4aace8627ef1d7 (diff) | |
[ADD] mail, mass_mailing: allow a user to resend a mail with failures
When a mail is in failure state, a red envelope appears next to the message
in a thread but it was difficult to send the mail again.
This tasks will allow users to send mail again easily, or mark notification
as cancelled if the user want to ignore this failure.
A notification will appear in sender systray while mail are in failure.
Task: #46158
PR: #24628
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/discuss.xml | 4 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 15 |
2 files changed, 13 insertions, 6 deletions
diff --git a/addons/mail/static/src/xml/discuss.xml b/addons/mail/static/src/xml/discuss.xml index 1ec08a23635..1eda1dfec1b 100644 --- a/addons/mail/static/src/xml/discuss.xml +++ b/addons/mail/static/src/xml/discuss.xml @@ -231,7 +231,9 @@ <span class="fa fa-mail-reply"/> You: </t> <t t-else=""> - <t t-esc="channel.last_message.displayed_author"/>: + <t t-if="channel.last_message.displayed_author"> + <t t-esc="channel.last_message.displayed_author"/>: + </t> </t> <t t-raw="channel.last_message_preview"/> </div> diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 20049e89cf6..ca8ae9b8319 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -175,14 +175,19 @@ (from <a t-att-data-oe-id="message.origin_id" href="#">#<t t-esc="message.origin_name"/></a>) </t> <span t-if="options.display_email_icon and message.customer_email_data and message.customer_email_data.length" class="o_thread_tooltip_container"> - <i t-att-class="'o_thread_tooltip o_thread_message_email o_thread_message_email_' + message.customer_email_status + ' fa fa-envelope-o'"/> + <t t-set="fatype" t-value="''"/> + <t t-if="message.customer_email_status === 'sent' or message.customer_email_status === 'ready'"> + <t t-set="fatype" t-value="'-o'"/> + </t> + <i t-att-class="'o_thread_tooltip o_thread_message_email o_thread_message_email_' + message.customer_email_status + ' fa fa-envelope'+ fatype" t-att-data-message-id="message.id"/> <span class="o_thread_tooltip_content"> <t t-foreach="message.customer_email_data" t-as="customer"> <span> - <t t-if="customer[2] == 'sent'"><i class='fa fa-check'/></t> - <t t-if="customer[2] == 'bounce'"><i class='fa fa-exclamation'/></t> - <t t-if="customer[2] == 'exception'"><i class='fa fa-exclamation'/></t> - <t t-if="customer[2] == 'ready'"><i class='fa fa-send-o'/></t> + <t t-if="customer[2] === 'sent'"><i class='fa fa-check'/></t> + <t t-if="customer[2] === 'bounce'"><i class='fa fa-exclamation'/></t> + <t t-if="customer[2] === 'exception'"><i class='fa fa-exclamation'/></t> + <t t-if="customer[2] === 'ready'"><i class='fa fa-send-o'/></t> + <t t-if="customer[2] === 'canceled'"><i class='fa fa-trash-o'/></t> <t t-esc="customer[1]"/> </span> <br /> |