mirror of https://github.com/OCA/social.git
[FIX] mail_tracking: bugfixes (#199)
* [FIX] Only one data-odoo-tracking-email tag in each email * [FIX] Get status even in multicompany instancespull/318/head
parent
0994ada510
commit
0c02f4bab5
|
@ -5,7 +5,7 @@
|
|||
{
|
||||
"name": "Email tracking",
|
||||
"summary": "Email tracking system for all mails sent",
|
||||
"version": "10.0.1.0.0",
|
||||
"version": "10.0.1.0.1",
|
||||
"category": "Social Network",
|
||||
"website": "http://www.tecnativa.com",
|
||||
"author": "Tecnativa, "
|
||||
|
|
|
@ -23,7 +23,7 @@ class IrMailServer(models.Model):
|
|||
tracking_email_id = False
|
||||
# https://regex101.com/r/lW4cB1/2
|
||||
match = re.search(
|
||||
r'<img [^>]* data-odoo-tracking-email=["\']([0-9]*)["\']', body)
|
||||
r'<img[^>]*data-odoo-tracking-email=["\']([0-9]*)["\']', body)
|
||||
if match:
|
||||
try:
|
||||
tracking_email_id = int(match.group(1))
|
||||
|
|
|
@ -37,7 +37,7 @@ class MailMessage(models.Model):
|
|||
partner_trackings = []
|
||||
partners_already = self.env['res.partner']
|
||||
partners = self.env['res.partner']
|
||||
trackings = self.env['mail.tracking.email'].search([
|
||||
trackings = self.env['mail.tracking.email'].sudo().search([
|
||||
('mail_message_id', '=', message.id),
|
||||
])
|
||||
# Search all trackings for this message
|
||||
|
|
|
@ -218,8 +218,12 @@ class MailTrackingEmail(models.Model):
|
|||
self.ensure_one()
|
||||
tracking_url = self._get_mail_tracking_img()
|
||||
if tracking_url:
|
||||
content = email.get('body', '')
|
||||
content = re.sub(
|
||||
r'<img[^>]*data-odoo-tracking-email=["\'][0-9]*["\'][^>]*>',
|
||||
'', content)
|
||||
body = tools.append_content_to_html(
|
||||
email.get('body', ''), tracking_url, plaintext=False,
|
||||
content, tracking_url, plaintext=False,
|
||||
container_tag='div')
|
||||
email['body'] = body
|
||||
return email
|
||||
|
|
Loading…
Reference in New Issue