diff options
| author | Thibault Delavallée <tde@odoo.com> | 2021-04-21 11:57:13 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2021-04-23 08:00:43 +0000 |
| commit | 206685760abbc725765a1f4a5002c2a90abc0af8 (patch) | |
| tree | 38a8785fcbbb6f1e904b4b6a50b4de7e691b6fe0 /addons/hr_holidays/models | |
| parent | 681eb75aeab02b9f904f85a3c60abd7c4a3c5269 (diff) | |
[FW][FIX] mail, various: fix document access link computation
Purpose of this commit is to fix computation of access link. In some cases
msg_vals modification leads to invalid URL computation, notably for frontend
or backend differentiation for target recipients.
Followup of odoo/odoo#63292 .
Task ID-2513724
COM PR odoo/odoo#69607
ENT PR odoo/enterprise#17849
X-Original-Commit: odoo/odoo@2015ef463c9ac7c7f89d543745c02a2d1528acf2
Diffstat (limited to 'addons/hr_holidays/models')
| -rw-r--r-- | addons/hr_holidays/models/hr_leave.py | 6 | ||||
| -rw-r--r-- | addons/hr_holidays/models/hr_leave_allocation.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py index fbf20ee87af..e3121f4532b 100644 --- a/addons/hr_holidays/models/hr_leave.py +++ b/addons/hr_holidays/models/hr_leave.py @@ -1220,15 +1220,15 @@ class HolidaysRequest(models.Model): """ Handle HR users and officers recipients that can validate or refuse holidays directly from email. """ groups = super(HolidaysRequest, self)._notify_get_groups(msg_vals=msg_vals) - msg_vals = msg_vals or {} + local_msg_vals = dict(msg_vals or {}) self.ensure_one() hr_actions = [] if self.state == 'confirm': - app_action = self._notify_get_action_link('controller', controller='/leave/validate', **msg_vals) + app_action = self._notify_get_action_link('controller', controller='/leave/validate', **local_msg_vals) hr_actions += [{'url': app_action, 'title': _('Approve')}] if self.state in ['confirm', 'validate', 'validate1']: - ref_action = self._notify_get_action_link('controller', controller='/leave/refuse', **msg_vals) + ref_action = self._notify_get_action_link('controller', controller='/leave/refuse', **local_msg_vals) hr_actions += [{'url': ref_action, 'title': _('Refuse')}] holiday_user_group_id = self.env.ref('hr_holidays.group_hr_holidays_user').id diff --git a/addons/hr_holidays/models/hr_leave_allocation.py b/addons/hr_holidays/models/hr_leave_allocation.py index b93514953b9..346b9e1d6b2 100644 --- a/addons/hr_holidays/models/hr_leave_allocation.py +++ b/addons/hr_holidays/models/hr_leave_allocation.py @@ -670,15 +670,15 @@ class HolidaysAllocation(models.Model): """ Handle HR users and officers recipients that can validate or refuse holidays directly from email. """ groups = super(HolidaysAllocation, self)._notify_get_groups(msg_vals=msg_vals) - msg_vals = msg_vals or {} + local_msg_vals = dict(msg_vals or {}) self.ensure_one() hr_actions = [] if self.state == 'confirm': - app_action = self._notify_get_action_link('controller', controller='/allocation/validate', **msg_vals) + app_action = self._notify_get_action_link('controller', controller='/allocation/validate', **local_msg_vals) hr_actions += [{'url': app_action, 'title': _('Approve')}] if self.state in ['confirm', 'validate', 'validate1']: - ref_action = self._notify_get_action_link('controller', controller='/allocation/refuse', **msg_vals) + ref_action = self._notify_get_action_link('controller', controller='/allocation/refuse', **local_msg_vals) hr_actions += [{'url': ref_action, 'title': _('Refuse')}] holiday_user_group_id = self.env.ref('hr_holidays.group_hr_holidays_user').id |