pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mail: fix notification buttons url generation

Browse Source 
* Assign controller now effectively redirects to mail/assign instead of
   mail/assign
 * Follow and Unfollow button now uses the helper that generated the link
This commit is contained in:
Thibault Delavallée
2016-09-23 10:00:18 +02:00
parent 26c7ff9118
commit 033fc508f4
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/controllers/main.py
+1 -1
View File
@@ -193,7 +193,7 @@ class MailController(http.Controller):
return werkzeug.utils.redirect('/mail/view?%s' % url_encode({'model': model, 'res_id': res_id}))
@http.route('/mail/assign', type='http', auth='user')
def mail_action_assign(self, model, res_id, **kwargs):
def mail_action_assign(self, model, res_id):
if model not in request.env:
return self._redirect_to_messaging()
Model = request.env[model]
addons/mail/models/mail_thread.py
+5 -6
View File
@@ -562,16 +562,15 @@ class MailThread(models.AbstractModel):
'message_id': kwargs.pop('message_id')
}
else:
self.ensure_one()
base_params = {
'model': self._name,
'res_id': self.ids[0],
'model': kwargs.pop('model', self._name),
'res_id': kwargs.pop('res_id', self.ids and self.ids[0] or False),
}
link = False
if link_type in ['view', 'assign', 'follow', 'unfollow']:
params = dict(base_params)
link = '/mail/view?%s' % url_encode(params)
link = '/mail/%s?%s' % (link_type, url_encode(params))
elif link_type == 'workflow':
params = dict(base_params, signal=kwargs['signal'])
link = '/mail/workflow?%s' % url_encode(params)
@@ -655,8 +654,8 @@ class MailThread(models.AbstractModel):
'followers': self.env['res.partner'],
'not_followers': self.env['res.partner'],
'button_access': {'url': access_link, 'title': view_title},
'button_follow': {'url': '/mail/follow?%s' % url_encode({'model': message.model, 'res_id': message.res_id}), 'title': _('Follow')},
'button_unfollow': {'url': '/mail/unfollow?%s' % url_encode({'model': message.model, 'res_id': message.res_id}), 'title': _('Unfollow')},
'button_follow': {'url': self._notification_link_helper('follow', model=message.model, res_id=message.res_id), 'title': _('Follow')},
'button_unfollow': {'url': self._notification_link_helper('unfollow', model=message.model, res_id=message.res_id), 'title': _('Unfollow')},
'actions': list(),
}
group_data[category] = self.env['res.partner']