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

Merge PR #926 into 12.0 

Signed-off-by pedrobaeza
pull/958/head
OCA-git-bot 2022-07-27 16:21:46 +00:00
parent 00144b9a44 f3c1b79852
commit a1bd2bc4f8
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mail_tracking/models/ir_mail_server.py
View File

@ -12,9 +12,8 @@ class IrMailServer(models.Model):
def _tracking_headers_add(self, tracking_email_id, headers): def _tracking_headers_add(self, tracking_email_id, headers):
"""Allow other addons to add its own tracking SMTP headers""" """Allow other addons to add its own tracking SMTP headers"""
headers = headers or {} headers = headers or {}
headers['X-Odoo-Database'] = getattr( headers["X-Odoo-Database"] = getattr(threading.currentThread(), "dbname", None)
threading.currentThread(), 'dbname', None), headers["X-Odoo-MailTracking-ID"] = tracking_email_id
headers['X-Odoo-Tracking-ID'] = tracking_email_id
return headers return headers
def _tracking_email_id_body_get(self, body): def _tracking_email_id_body_get(self, body):
@ -42,9 +41,16 @@ class IrMailServer(models.Model):
return msg return msg
def _tracking_email_get(self, message): def _tracking_email_get(self, message):
tracking_email_id = False try:
if message.get('X-Odoo-Tracking-ID', '').isdigit(): tracking_email_id = int(
tracking_email_id = int(message['X-Odoo-Tracking-ID']) message.get(
"X-Odoo-MailTracking-ID",
# Deprecated tracking header, kept as fallback
message["X-Odoo-Tracking-ID"],
)
)
except (TypeError, ValueError, KeyError):
tracking_email_id = False
return self.env['mail.tracking.email'].browse(tracking_email_id) return self.env['mail.tracking.email'].browse(tracking_email_id)
def _smtp_server_get(self, mail_server_id, smtp_server): def _smtp_server_get(self, mail_server_id, smtp_server):