Techsystech
/
social
mirror of https://github.com/OCA/social.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #107 from Tecnativa/8.0-mail_tracking_base_url 

[8.0][IMP][mail_tracking] Allow to define a custom mail_tracking base url
pull/120/head
Pedro M. Baeza 2016-10-14 15:41:18 +02:00 committed by GitHub
parent 2ea3a4048e 91aee344c2
commit 6c247ea60a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail_tracking/__openerp__.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": "8.0.3.0.0", "version": "8.0.3.0.1",
"category": "Social Network", "category": "Social Network",
"website": "http://www.tecnativa.com", "website": "http://www.tecnativa.com",
"author": "Tecnativa, " "author": "Tecnativa, "

4
mail_tracking/models/mail_tracking_email.py
View File

@ -171,7 +171,9 @@ class MailTrackingEmail(models.Model):
fields.Date.from_string(email.time)) fields.Date.from_string(email.time))
def _get_mail_tracking_img(self): def _get_mail_tracking_img(self):
base_url = self.env['ir.config_parameter'].get_param('web.base.url') m_config = self.env['ir.config_parameter']
base_url = (m_config.get_param('mail_tracking.base.url') or
m_config.get_param('web.base.url'))
path_url = ( path_url = (
'mail/tracking/open/%(db)s/%(tracking_email_id)s/blank.gif' % { 'mail/tracking/open/%(db)s/%(tracking_email_id)s/blank.gif' % {
'db': self.env.cr.dbname, 'db': self.env.cr.dbname,