From 62591c58f8abded96b5fedcc4d9760550b7bdf18 Mon Sep 17 00:00:00 2001
From: XavierDo <xdo@odoo.com>
Date: Tue, 26 Jun 2018 11:17:21 +0200
Subject: [PATCH] [FIX] mail: add ability to mark failure notification as read

The mark as read button was not working for mail failure. More than that,
we wanted a functionnality to be able to massively mark mail failure as canceled,
especially to be able to clean databases from failure after migration.

Task: #1860054
PR: #25622
---
 addons/mail/static/img/red_envelope.png       | Bin 0 -> 7074 bytes
 addons/mail/static/src/js/systray.js          |   9 +++++
 addons/mail/static/src/xml/discuss.xml        |   2 +-
 addons/mail/wizard/mail_resend_message.py     |  35 +++++++++++++++++-
 .../mail/wizard/mail_resend_message_views.xml |  25 +++++++++++++
 5 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 addons/mail/static/img/red_envelope.png

diff --git a/addons/mail/static/img/red_envelope.png b/addons/mail/static/img/red_envelope.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a6152ae5de56ba055f7323f9fe060662fac140a
GIT binary patch
literal 7074
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
KDqAUS2Kz6kFH-aX

literal 0
HcmV?d00001

diff --git a/addons/mail/static/src/js/systray.js b/addons/mail/static/src/js/systray.js
index 18e9511cf25..f354d2ec6f7 100644
--- a/addons/mail/static/src/js/systray.js
+++ b/addons/mail/static/src/js/systray.js
@@ -207,6 +207,15 @@ var MessagingMenu = Widget.extend({
             var model = $(ev.currentTarget).data('model');
             var domain = [['model', '=', model], ['res_id', '=', resID]];
             this.call('chat_manager', 'markAllAsRead', channel, domain);
+        } else if (channelID === 'mail_failure') {
+            var unread_counter = $(ev.currentTarget).data('unread_counter');
+            var model = $(ev.currentTarget).data('model');
+            this.do_action('mail.mail_resend_cancel_action', {
+                additional_context: {
+                    default_model: model,
+                    unread_counter: unread_counter
+                }
+            });
         } else {
             this.call('chat_manager', 'markChannelAsSeen', channel);
         }
diff --git a/addons/mail/static/src/xml/discuss.xml b/addons/mail/static/src/xml/discuss.xml
index 1eda1dfec1b..f1fef247c7c 100644
--- a/addons/mail/static/src/xml/discuss.xml
+++ b/addons/mail/static/src/xml/discuss.xml
@@ -237,7 +237,7 @@
                     </t>
                     <t t-raw="channel.last_message_preview"/>
                 </div>
-                <span t-att-data-channel_id="channel.id" t-att-data-res_id="channel.res_id" t-att-data-model="channel.model" title="Mark as Read" class="o_discuss_icon  o_mail_channel_mark_read fa fa-check" t-if="channel.unread_counter"/>
+                <span t-att-data-channel_id="channel.id" t-att-data-res_id="channel.res_id" t-att-data-model="channel.model" t-att-data-unread_counter="channel.unread_counter" title="Mark as Read" class="o_discuss_icon  o_mail_channel_mark_read fa fa-check" t-if="channel.unread_counter"/>
             </div>
         </div>
     </t>
diff --git a/addons/mail/wizard/mail_resend_message.py b/addons/mail/wizard/mail_resend_message.py
index 2f3890755c1..f637b0ca737 100644
--- a/addons/mail/wizard/mail_resend_message.py
+++ b/addons/mail/wizard/mail_resend_message.py
@@ -70,7 +70,6 @@ class MailResendMessage(models.TransientModel):
         return {'type': 'ir.actions.act_window_close'}
 
 
-
 class PartnerResend(models.TransientModel):
     _name = 'mail.resend.partner'
     _description = 'Partner with additionnal information for mail resend'
@@ -82,3 +81,37 @@ class PartnerResend(models.TransientModel):
     resend_wizard_id = fields.Many2one('mail.resend.message', string="Resend wizard")
     message = fields.Char(string="Help message")
 
+
+class MailCancelResend(models.TransientModel):
+    _name = 'mail.resend.cancel'
+    _description = 'Dismiss notification for resend by model'
+
+    model = fields.Char(string='Model')
+    help_message = fields.Char(string='Help message', compute='_compute_help_message')
+
+    @api.multi
+    @api.depends('model')
+    def _compute_help_message(self):
+        for wizard in self:
+            wizard.help_message = _("Are you sure you want to discard %s mail delivery failures. You won't be able to re-send these mails later!") % (wizard._context.get('unread_counter'))
+
+    @api.multi
+    def cancel_resend_action(self):
+        author_id = self.env.user.partner_id.id
+        for wizard in self:
+            self._cr.execute("""
+                                SELECT notif.id, mes.id
+                                FROM mail_message_res_partner_needaction_rel notif
+                                JOIN mail_message mes
+                                    ON notif.mail_message_id = mes.id
+                                WHERE notif.email_status IN ('bounce', 'exception')
+                                    AND mes.model = %s
+                                    AND mes.author_id = %s
+                            """, (wizard.model, author_id))
+            res = self._cr.fetchall()
+            notif_ids = [row[0] for row in res]
+            messages_ids = list(set([row[1] for row in res]))
+            if notif_ids:
+                self.env["mail.notification"].browse(notif_ids).sudo().write({'email_status': 'canceled'})
+                self.env["mail.message"].browse(messages_ids)._notify_failure_update()
+        return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/mail/wizard/mail_resend_message_views.xml b/addons/mail/wizard/mail_resend_message_views.xml
index 970b56636b5..b0e6f1ade83 100644
--- a/addons/mail/wizard/mail_resend_message_views.xml
+++ b/addons/mail/wizard/mail_resend_message_views.xml
@@ -29,6 +29,23 @@
                 </form>
             </field>
         </record>
+        <record id="mail_resend_cancel_view_form" model="ir.ui.view">
+            <field name="name">mail.resend.cancel.form</field>
+            <field name="model">mail.resend.cancel</field>
+            <field name="groups_id" eval="[(4,ref('base.group_user'))]"/>
+            <field name="arch" type="xml">
+                <form string="Cancel notification in failure">
+                    <field name="model" invisible='1'/>
+                    <field name="help_message"/>
+                    <p>If you want to re-send them, click Cancel now, then click on the notification and review them one by one by clicking on the red envelope next to each message.</p>
+                    <img src="/mail/static/img/red_envelope.png"/>
+                    <footer>  
+                        <button string="Discard delivery failures" name="cancel_resend_action" type="object" class="btn-primary" />
+                        <button string="Cancel" class="btn-default" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
         <record id="mail_resend_message_action" model="ir.actions.act_window">
             <field name="name">Resend mail</field>
             <field name="res_model">mail.resend.message</field>
@@ -37,6 +54,14 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
+        <record id="mail_resend_cancel_action" model="ir.actions.act_window">
+            <field name="name">Discard mail delivery failures</field>
+            <field name="res_model">mail.resend.cancel</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
     </data>
 </odoo>