From f22169ebfb3ba1c76cfd2685299f756948648afa Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Wed, 2 Apr 2014 11:37:21 +0200 Subject: [PATCH] [FIX] website_mail: overwritten _search method created domains syntactically not correct + security rule was applied on superuser bzr revid: dle@openerp.com-20140402093721-hwcdwltbkict4oz4 --- addons/website_mail/models/mail_message.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/addons/website_mail/models/mail_message.py b/addons/website_mail/models/mail_message.py index 12c35f3e83f..e9e06794523 100644 --- a/addons/website_mail/models/mail_message.py +++ b/addons/website_mail/models/mail_message.py @@ -19,9 +19,9 @@ # ############################################################################## +from openerp import SUPERUSER_ID from openerp.tools.translate import _ -from openerp.osv import osv, fields - +from openerp.osv import osv, fields, expression class MailMessage(osv.Model): _inherit = 'mail.message' @@ -48,10 +48,11 @@ class MailMessage(osv.Model): context=None, count=False, access_rights_uid=None): """ Override that adds specific access rights of mail.message, to restrict messages to published messages for public users. """ - group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id - group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_public')[1] - if group_user_id in [group.id for group in group_ids]: - args = ['&', ('website_published', '=', True)] + list(args) + if uid != SUPERUSER_ID: + group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id + group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_public')[1] + if group_user_id in [group.id for group in group_ids]: + args = expression.AND([[('website_published', '=', True)], list(args)]) return super(MailMessage, self)._search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=count, access_rights_uid=access_rights_uid)