Browse Source

[FIX] Avoid JS error when no tracking info (#92)

pull/96/head
Antonio Espinosa 8 years ago
committed by Holger Brunn
parent
commit
dc0a2819ca
  1. 2
      mail_tracking/__openerp__.py
  2. 1
      mail_tracking/static/src/js/mail_tracking.js
  3. 2
      mail_tracking/static/src/xml/mail_tracking.xml

2
mail_tracking/__openerp__.py

@ -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": "8.0.2.0.1",
"version": "8.0.2.0.2",
"category": "Social Network", "category": "Social Network",
"website": "http://www.tecnativa.com", "website": "http://www.tecnativa.com",
"author": "Tecnativa, " "author": "Tecnativa, "

1
mail_tracking/static/src/js/mail_tracking.js

@ -30,7 +30,6 @@
'title': _t("Message tracking"), 'title': _t("Message tracking"),
}; };
instance.webclient.action_manager.do_push_state(state); instance.webclient.action_manager.do_push_state(state);
console.log('tracking_email_id = ' + tracking_email_id);
var action = { var action = {
type:'ir.actions.act_window', type:'ir.actions.act_window',
view_type: 'form', view_type: 'form',

2
mail_tracking/static/src/xml/mail_tracking.xml

@ -42,7 +42,7 @@
<t t-extend="mail.thread.message"> <t t-extend="mail.thread.message">
<t t-jquery="span[t-attf-class='oe_partner_follower']" t-operation="append"> <t t-jquery="span[t-attf-class='oe_partner_follower']" t-operation="append">
<t t-set='tracking' t-value='widget.partner_trackings[partner[0]]'/>
<t t-set="tracking" t-value="widget.partner_trackings[partner[0]] || ['unknown']"/>
<t t-if="tracking[1]"> <t t-if="tracking[1]">
<span class="mail_tracking oe_mail_action_tracking" <span class="mail_tracking oe_mail_action_tracking"
t-att-data-tracking="tracking[1]" t-att-data-tracking="tracking[1]"

Loading…
Cancel
Save