openerp-community-reviewer team mailing list archive

["Guewen Baconnier @ Camptocamp" <guewen.baconnier@xxxxxxxxxxxxxx>]

Guewen Baconnier @ Camptocamp has proposed merging lp:~camptocamp/ocb-addons/7.0-send-message-slow-1311087 into lp:ocb-addons.

Requested reviews:
  OpenERP Community Backports (ocb)

For more details, see:
https://code.launchpad.net/~camptocamp/ocb-addons/7.0-send-message-slow-1311087/+merge/222765

Backport of: https://github.com/odoo/odoo/pull/461
Fixes lp:1311087
-- 
https://code.launchpad.net/~camptocamp/ocb-addons/7.0-send-message-slow-1311087/+merge/222765
Your team OpenERP Community Backports is requested to review the proposed merge of lp:~camptocamp/ocb-addons/7.0-send-message-slow-1311087 into lp:ocb-addons.

=== modified file 'mail/mail_message.py'
--- mail/mail_message.py	2014-03-10 08:54:20 +0000
+++ mail/mail_message.py	2014-06-11 09:26:30 +0000
@@ -881,9 +881,11 @@
             fol_ids = fol_obj.search(cr, SUPERUSER_ID, [
                 ('res_model', '=', message.model),
                 ('res_id', '=', message.res_id),
-                ('subtype_ids', 'in', message.subtype_id.id)
                 ], context=context)
-            partners_to_notify |= set(fo.partner_id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context))
+            partners_to_notify |= set(
+                fo.partner_id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context)
+                if message.subtype_id.id in [st.id for st in fo.subtype_ids]
+            )
         # remove me from notified partners, unless the message is written on my own wall
         if message.author_id and message.model == "res.partner" and message.res_id == message.author_id.id:
             partners_to_notify |= set([message.author_id])