From 049509261252c64e7f0052f1da020adbc1d154d0 Mon Sep 17 00:00:00 2001
From: Veronika Kotovich <veronika.kotovich@gmail.com>
Date: Mon, 31 Aug 2015 18:13:40 +0300
Subject: [PATCH] Add message delete functionality

---
 mail_move_message_models.py        | 10 ++++++++--
 mail_move_message_views.xml        |  2 +-
 static/src/js/mail_move_message.js |  7 ++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/mail_move_message_models.py b/mail_move_message_models.py
index 4b2ab77..94d7fee 100644
--- a/mail_move_message_models.py
+++ b/mail_move_message_models.py
@@ -27,13 +27,13 @@ class wizard(models.TransientModel):
     message_moved_by_message_id = fields.Many2one('mail.message', related='message_id.moved_by_message_id', string='Moved with', readonly=True)
     message_moved_by_user_id = fields.Many2one('res.users', related='message_id.moved_by_user_id', string='Moved by', readonly=True)
     message_is_moved = fields.Boolean(string='Is Moved', related='message_id.is_moved', readonly=True)
-    parent_id = fields.Many2one('mail.message', string='Search by name')
+    parent_id = fields.Many2one('mail.message', string='Search by name', )
     model = fields.Selection(_model_selection, string='Model', default=_default_model)
     res_id = fields.Integer(string='Record ID', default=_default_res)
     record_url = fields.Char('Link to record', readonly=True)
     can_move = fields.Boolean('Can move', compute='get_can_move')
     move_back = fields.Boolean('Move to origin', help='Move  message and submessages to original place')
-    partner_id = fields.Many2one('res.partner', string='Author')
+    partner_id = fields.Many2one('res.partner', string='Author', related='message_id.author_id')
     filter_by_partner = fields.Boolean('Filter Records by partner')
 
     @api.depends('message_id')
@@ -79,6 +79,7 @@ class wizard(models.TransientModel):
     def on_change_partner(self):
         domain = {'res_id': []}
         if self.model and self.filter_by_partner and self.partner_id:
+            self.res_id = None
             fields = self.env[self.model].fields_get(False)
             contact_field = False
             for n, f in fields.iteritems():
@@ -147,6 +148,11 @@ class wizard(models.TransientModel):
             'type': 'ir.actions.act_window',
         }
 
+    @api.one
+    def delete(self):
+        self.message_id.unlink()
+        return {}
+
 
 class mail_message(models.Model):
     _inherit = 'mail.message'
diff --git a/mail_move_message_views.xml b/mail_move_message_views.xml
index 4f6bddf..113ef27 100644
--- a/mail_move_message_views.xml
+++ b/mail_move_message_views.xml
@@ -53,7 +53,7 @@
                 <field name="message_body"/>
             </div>
             <separator/>
-            <button name="delete" string="Delete message" type="object" class="oe_highlight"/>
+            <button name="delete" string="Delete message" type="object" class="oe_highlight" confirm="Do you really want to delete this message?"/>
         </form>
     </field>
 </record>
diff --git a/static/src/js/mail_move_message.js b/static/src/js/mail_move_message.js
index 88b323f..b68c3a7 100644
--- a/static/src/js/mail_move_message.js
+++ b/static/src/js/mail_move_message.js
@@ -10,6 +10,7 @@ openerp.mail_move_message = function (session) {
             this.$('.oe_move').on('click', this.on_move_message)
         },
         on_move_message: function(event){
+            var self = this;
             var context = {
                 'default_message_id': this.id
             }
@@ -24,7 +25,11 @@ openerp.mail_move_message = function (session) {
                 context: context,
             };
 
-            this.do_action(action);
+            self.do_action(action, {
+                'on_close': function(){
+                    self.check_for_rerender();
+                }
+            });
         }
     })