From 2cfb915f2507b3c878d77cbc07101b3186220593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Fri, 21 Aug 2015 15:41:23 +0200 Subject: [PATCH] [FIX] mail: use correct redirect action The redirect action to the inbox was removed, but the tests (and the default action method) need to be updated. --- addons/mail/models/mail_thread.py | 2 +- addons/mail/views/mail_channel_views.xml | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index f295d2f8347..21b07836973 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -504,7 +504,7 @@ class MailThread(models.AbstractModel): """ When redirecting towards the Inbox, choose which action xml_id has to be fetched. This method is meant to be inherited, at least in portal because portal users have a different Inbox action than classic users. """ - return 'mail.mail_message_action_inbox' + return 'mail.mail_channel_action_client_slack' @api.multi def _notification_link_helper(self, link_type, **kwargs): diff --git a/addons/mail/views/mail_channel_views.xml b/addons/mail/views/mail_channel_views.xml index 1112bcc0072..ce0413beb37 100644 --- a/addons/mail/views/mail_channel_views.xml +++ b/addons/mail/views/mail_channel_views.xml @@ -184,10 +184,6 @@ - - - - Chat mail.chat.instant_messaging