diff --git a/mail_move_message/mail_move_message_models.py b/mail_move_message/mail_move_message_models.py index 7193771..5f58016 100644 --- a/mail_move_message/mail_move_message_models.py +++ b/mail_move_message/mail_move_message_models.py @@ -307,6 +307,10 @@ class mail_message(models.Model): 'res_model': r_vals.get('model') }) + # Send notification + notification = {'message_ids': [self.id], 'values': vals} + self.env['bus.bus'].sendone((self._cr.dbname, 'res.partner', self.env.user.partner_id.id), notification) + def name_get(self, cr, uid, ids, context=None): if not (context or {}).get('extended_name'): return super(mail_message, self).name_get(cr, uid, ids, context=context) diff --git a/mail_move_message/static/src/css/mail_move_message.css b/mail_move_message/static/src/css/mail_move_message.css index effef81..b33f4f2 100644 --- a/mail_move_message/static/src/css/mail_move_message.css +++ b/mail_move_message/static/src/css/mail_move_message.css @@ -1,4 +1,4 @@ -i.fa.fa-arrows-alt.oe_move.oe_moved { +i.oe_moved { color: #ED6F6A; text-shadow: 0px 1px #961b1b,0px -1px #961b1b, -1px 0px #961b1b, 1px 0px #961b1b, 0px 3px 3px rgba(0,0,0,0.1); } diff --git a/mail_move_message/static/src/js/mail_move_message.js b/mail_move_message/static/src/js/mail_move_message.js index c178b8e..039417b 100644 --- a/mail_move_message/static/src/js/mail_move_message.js +++ b/mail_move_message/static/src/js/mail_move_message.js @@ -1,6 +1,7 @@ odoo.define('mail_move_message.relocate', function (require) { "use strict"; + var bus = require('bus.bus').bus; var chat_manager = require('mail.chat_manager'); var base_obj = require('mail_base.base'); var thread = require('mail.ChatThread'); @@ -48,14 +49,20 @@ odoo.define('mail_move_message.relocate', function (require) { 'on_close': function(){ var message = base_obj.chat_manager.get_message(self.message_id); chat_manager.bus.trigger('update_message', message); + self.fetch_and_render_thread(); + bus.on('notification', null, self.on_notification); } - }).then(function(){ - self.fetch_and_render_thread(); }); + }, + on_notification: function(notification){ + var model = notification[0][1]; + if (model === 'ir.needaction') { + // new message in the inbox + chat_manager.mail_tools.on_needaction_notification(notification[1]); + } } }); - // TODO: icon show that message was moved after reload thread. How reload thread? base_obj.MailTools.include({ make_message: function(data){ var msg = this._super(data); diff --git a/mail_move_message/static/src/xml/mail_move_message_main.xml b/mail_move_message/static/src/xml/mail_move_message_main.xml index 88fffd3..fe6d98c 100644 --- a/mail_move_message/static/src/xml/mail_move_message_main.xml +++ b/mail_move_message/static/src/xml/mail_move_message_main.xml @@ -12,7 +12,7 @@