From e640743e2faaefe4b00879a569b6e24b9af349ed Mon Sep 17 00:00:00 2001 From: Emanuel Cino Date: Fri, 13 Apr 2018 16:05:46 +0200 Subject: [PATCH] [FIX] mail_tracking js could break other modules using chat_manager --- mail_tracking/__manifest__.py | 2 +- mail_tracking/static/src/js/mail_tracking.js | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/mail_tracking/__manifest__.py b/mail_tracking/__manifest__.py index c0818f9..dac53f6 100644 --- a/mail_tracking/__manifest__.py +++ b/mail_tracking/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Email tracking", "summary": "Email tracking system for all mails sent", - "version": "10.0.1.1.0", + "version": "10.0.1.1.1", "category": "Social Network", "website": "http://www.tecnativa.com", "author": "Tecnativa, " diff --git a/mail_tracking/static/src/js/mail_tracking.js b/mail_tracking/static/src/js/mail_tracking.js index 7e1daa5..7932bf8 100644 --- a/mail_tracking/static/src/js/mail_tracking.js +++ b/mail_tracking/static/src/js/mail_tracking.js @@ -8,22 +8,18 @@ var core = require('web.core'); var session = require('web.session'); var Model = require('web.Model'); var ActionManager = require('web.ActionManager'); -var chat_manager = require('mail.chat_manager'); var ChatThread = require('mail.ChatThread'); -var Chatter = require('mail.Chatter'); var _t = core._t; var MessageModel = new Model('mail.message', session.context); -// chat_manager is a simple dictionary, not an OdooClass -chat_manager._make_message_super = chat_manager.make_message; -chat_manager.make_message = function(data) { - var msg = this._make_message_super(data); - msg.partner_trackings = data.partner_trackings || []; - return msg; -}; ChatThread.include({ + _preprocess_message: function (message) { + var msg = this._super.apply(this, arguments); + msg.partner_trackings = msg.partner_trackings || []; + return msg; + }, on_tracking_partner_click: function (event) { var partner_id = this.$el.find(event.currentTarget).data('partner'); var state = {