diff options
| author | Christophe Simonis <chs@openerp.com> | 2014-04-07 18:33:18 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2014-04-07 18:33:18 +0200 |
| commit | 0fad8159f3e77336e34de017a4ca5f28d7a7fe02 (patch) | |
| tree | 2bf89418078c923826a535c69395fa92bba8e16b /addons/website_mail/models/mail_message.py | |
| parent | f1d3f2a0c42f1de5970b5f897c4e5b279d1ee23b (diff) | |
| parent | ffae3807255269ff290bdf9fe62bc668feaade75 (diff) | |
[MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
Diffstat (limited to 'addons/website_mail/models/mail_message.py')
| -rw-r--r-- | addons/website_mail/models/mail_message.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/addons/website_mail/models/mail_message.py b/addons/website_mail/models/mail_message.py index a376d391a33..1e50611fa00 100644 --- a/addons/website_mail/models/mail_message.py +++ b/addons/website_mail/models/mail_message.py @@ -19,10 +19,10 @@ # ############################################################################## +from openerp import SUPERUSER_ID from openerp.tools import html2plaintext 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' @@ -63,10 +63,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) |