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

Merge PR #741 into 13.0 

Signed-off-by Yajo
pull/744/head
OCA-git-bot 2021-07-09 13:25:28 +00:00
parent bfd66fd5cc b7b69281c6
commit 4550301224
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mail_tracking/models/ir_mail_server.py
View File

@ -13,10 +13,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"] = ( headers["X-Odoo-Database"] = getattr(threading.currentThread(), "dbname", None)
getattr(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):
@ -66,9 +64,16 @@ class IrMailServer(models.Model):
return msg return msg
def _tracking_email_get(self, message): def _tracking_email_get(self, message):
try:
tracking_email_id = int(
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 tracking_email_id = False
if message.get("X-Odoo-Tracking-ID", "").isdigit():
tracking_email_id = int(message["X-Odoo-Tracking-ID"])
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):