Yaltik/social
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] mail_tracking js could break other modules using chat_manager

Browse Source
This commit is contained in:
Emanuel Cino 2018-04-13 16:05:46 +02:00 committed by Jasmin Solanki
parent 86031a98a9
commit e640743e2f
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail_tracking/__manifest__.py
View File

@ -5,7 +5,7 @@
{ {
"name": "Email tracking", "name": "Email tracking",
"summary": "Email tracking system for all mails sent", "summary": "Email tracking system for all mails sent",
"version": "10.0.1.1.0", "version": "10.0.1.1.1",
"category": "Social Network", "category": "Social Network",
"website": "http://www.tecnativa.com", "website": "http://www.tecnativa.com",
"author": "Tecnativa, " "author": "Tecnativa, "

14
mail_tracking/static/src/js/mail_tracking.js
View File

@ -8,22 +8,18 @@ var core = require('web.core');
var session = require('web.session'); var session = require('web.session');
var Model = require('web.Model'); var Model = require('web.Model');
var ActionManager = require('web.ActionManager'); var ActionManager = require('web.ActionManager');
var chat_manager = require('mail.chat_manager');
var ChatThread = require('mail.ChatThread'); var ChatThread = require('mail.ChatThread');
var Chatter = require('mail.Chatter');
var _t = core._t; var _t = core._t;
var MessageModel = new Model('mail.message', session.context); 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({ 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) { on_tracking_partner_click: function (event) {
var partner_id = this.$el.find(event.currentTarget).data('partner'); var partner_id = this.$el.find(event.currentTarget).data('partner');
var state = { var state = {