From 2ae09150a52df758a4faf498af920e6399a25921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 25 Aug 2016 13:53:49 +0200 Subject: [PATCH] [REM] mail, forum: remove hack to add buttons in forum notifications It has been solved using the standard way of managing buttons in notification emails. At least we hope it. --- addons/mail/data/mail_data.xml | 2 +- addons/mail/models/mail_message.py | 5 ----- addons/mail/models/res_partner.py | 1 - addons/website_forum/models/forum.py | 9 --------- 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index 29a11948c6a..3645ba2e337 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -76,7 +76,7 @@ % endif -% if not ctx['is_discussion'] or not len(ctx['actions']) == 0 or ctx.get('button_access') or ctx.get('is_accessible'): +% if not ctx['is_discussion'] or not len(ctx['actions']) == 0 or ctx.get('button_access'):
diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py index 53794d4038a..d551c97d418 100644 --- a/addons/mail/models/mail_message.py +++ b/addons/mail/models/mail_message.py @@ -114,11 +114,6 @@ class Message(models.Model): for message in self: message.needaction = message in my_messages - @api.multi - def _is_accessible(self): - self.ensure_one() - return False - @api.model def _search_needaction(self, operator, operand): if operator == '=' and operand: diff --git a/addons/mail/models/res_partner.py b/addons/mail/models/res_partner.py index 125acce8010..78404ed8ec5 100644 --- a/addons/mail/models/res_partner.py +++ b/addons/mail/models/res_partner.py @@ -86,7 +86,6 @@ class Partner(models.Model): 'tracking': tracking, 'is_discussion': is_discussion, 'subtype': message.subtype_id, - 'is_accessible': message._is_accessible() } @api.model diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py index 3ef6636af73..d36126de7f8 100644 --- a/addons/website_forum/models/forum.py +++ b/addons/website_forum/models/forum.py @@ -911,12 +911,3 @@ class Tags(models.Model): if self.env.user.karma < forum.karma_tag_create: raise KarmaError(_('Not enough karma to create a new Tag')) return super(Tags, self.with_context(mail_create_nolog=True, mail_create_nosubscribe=True)).create(vals) - -class Message(models.Model): - _name = 'mail.message' - _inherit = ['mail.message'] - - @api.multi - def _is_accessible(self): - res = super(Message, self)._is_accessible() - return self.model == 'forum.post' or res