From f64d4a5adab2d5c61fca2f5ad01d8cd1e246021d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 12 Dec 2012 17:08:04 +0100 Subject: [PATCH] [CLEAN] mail: misc cleaning of read -> browse, SUPERUSER_ID -> uid, because no need to SUPERUSER in this case. bzr revid: tde@openerp.com-20121212160804-n182n9bzo8vscuvt --- addons/mail/mail_thread.py | 2 +- addons/mail/res_users.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index ac2b0efb670..63043f992f3 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -799,7 +799,7 @@ class mail_thread(osv.AbstractModel): # if subtypes are not specified (and not set to a void list), fetch default ones if subtype_ids is None: subtype_obj = self.pool.get('mail.message.subtype') - subtype_ids = subtype_obj.search(cr, SUPERUSER_ID, [('default', '=', True), '|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context) + subtype_ids = subtype_obj.search(cr, uid, [('default', '=', True), '|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context) # update the subscriptions fol_obj = self.pool.get('mail.followers') fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('res_id', 'in', ids), ('partner_id', 'in', partner_ids)], context=context) diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py index 6f1329597c6..33a6b56342c 100644 --- a/addons/mail/res_users.py +++ b/addons/mail/res_users.py @@ -127,7 +127,7 @@ class res_users(osv.Model): context['thread_model'] = 'res.partner' if isinstance(thread_id, (list, tuple)): thread_id = thread_id[0] - partner_id = self.pool.get('res.users').read(cr, uid, thread_id, ['partner_id'], context=context)['partner_id'][0] + partner_id = self.browse(cr, uid, thread_id).partner_id.id return self.pool.get('res.partner').message_post_user_api(cr, uid, partner_id, body=body, subject=subject, parent_id=parent_id, attachment_ids=attachment_ids, context=context, content_subtype=content_subtype, **kwargs) @@ -141,11 +141,11 @@ class res_users(osv.Model): context['thread_model'] = 'res.partner' if isinstance(thread_id, (list, tuple)): thread_id = thread_id[0] - partner_id = self.pool.get('res.users').read(cr, uid, thread_id, ['partner_id'], context=context)['partner_id'][0] + partner_id = self.browse(cr, uid, thread_id).partner_id.id return self.pool.get('res.partner').message_post(cr, uid, partner_id, context=context, **kwargs) def message_update(self, cr, uid, ids, msg_dict, update_vals=None, context=None): - partner_id = self.pool.get('res.users').browse(cr, uid, ids)[0].partner_id.id + partner_id = self.browse(cr, uid, ids)[0].partner_id.id return self.pool.get('res.partner').message_update(cr, uid, [partner_id], msg_dict, update_vals=update_vals, context=context)