From ecc028c0e8dee8f1c85e750d625061e66a691d4e Mon Sep 17 00:00:00 2001
From: Romeo Fragomeli
Date: Wed, 30 Oct 2019 09:11:52 +0000
Subject: [PATCH] [IMP] mail: use _notify_get_action_link and not inline string
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Note that this also add data-oe-model and data-oe-id in XML.
This allow us to avoid to load these links as external URL when
a user receive it in inbox instead of external mail client.
See file addons/mail/static/src/js/thread_widget.js -> _onClickRedirect
Task ID: 1895451
closes odoo/odoo#39958
Related: odoo/enterprise#6414
Signed-off-by: Adrien Dieudonné (adr)
---
addons/mail/data/mail_data.xml | 4 ++--
addons/mail/models/mail_activity.py | 6 +++++-
addons/mail/models/mail_thread.py | 1 +
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index f024c60b207..a83cafbbc8d 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -308,7 +308,7 @@
You have been assigned to the .
-
+
View
@@ -341,7 +341,7 @@
on
to close for .
-
View
diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py
index 55e2db647bd..933cca5d48d 100644
--- a/addons/mail/models/mail_activity.py
+++ b/addons/mail/models/mail_activity.py
@@ -387,7 +387,11 @@ class MailActivity(models.Model):
for activity in self:
model_description = self.env['ir.model']._get(activity.res_model).display_name
body = body_template.render(
- dict(activity=activity, model_description=model_description),
+ dict(
+ activity=activity,
+ model_description=model_description,
+ access_link=self.env['mail.thread']._notify_get_action_link('view', model=activity.res_model, res_id=activity.res_id),
+ ),
engine='ir.qweb',
minimal_qcontext=True
)
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index f3f703666b3..89b6818bc64 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -2812,6 +2812,7 @@ class MailThread(models.AbstractModel):
values = {
'object': record,
'model_description': model_description,
+ 'access_link': self._notify_get_action_link('view'),
}
assignation_msg = view.render(values, engine='ir.qweb', minimal_qcontext=True)
assignation_msg = self.env['mail.thread']._replace_local_links(assignation_msg)