[MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx

bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk

2 files changed, 12 insertions, 7 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)
diff --git a/addons/website_mail/models/mail_thread.py b/addons/website_mail/models/mail_thread.py
index c88fd032271..d7f750872ca 100644
--- a/addons/website_mail/models/mail_thread.py
+++ b/addons/website_mail/models/mail_thread.py
@@ -21,7 +21,7 @@
 
 from openerp.osv import osv, fields
 
-
+# TODO for trunk, remove me
 class MailThread(osv.Model):
     _inherit = 'mail.thread'
 
@@ -35,3 +35,7 @@ class MailThread(osv.Model):
             help="Website communication history",
         ),
     }
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        default['website_message_ids'] = []
+        return super(MailThread, self).copy(cr, uid, id, default=default, context=context)
\ No newline at end of file