From: Thibault Delavallée Date: Fri, 22 Aug 2014 10:59:18 +0000 (+0200) Subject: [FIX] mail: when checking for possible messages to fetch, perform X-Git-Tag: 8.0.0~281 X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=3211ff7c780dcddf67278a3a616ecc84f9ad578a;p=odoo%2Fodoo.git [FIX] mail: when checking for possible messages to fetch, perform a search_count on mail_message when the actual number of messages or their ids is not necessary, to speedup the computation. --- diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 6413e1c..2529c4b 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -450,8 +450,8 @@ class mail_message(osv.Model): exp_domain = domain + [('id', '<', min(message_unload_ids + message_ids))] else: exp_domain = domain + ['!', ('id', 'child_of', message_unload_ids + parent_tree.keys())] - ids = self.search(cr, uid, exp_domain, context=context, limit=1) - if ids: + more_count = self.search_count(cr, uid, exp_domain, context=context) + if more_count: # inside a thread: prepend if parent_id: messages.insert(0, _get_expandable(exp_domain, -1, parent_id, True))