Merge lp:~camptocamp/ocb-addons/7.0-fix-1311087-rgo into lp:ocb-addons

Proposed by Yannick Vaucher @ Camptocamp on 2014-06-24
Status: Rejected
Rejected by: Holger Brunn (Therp) on 2014-11-24
Proposed branch: lp:~camptocamp/ocb-addons/7.0-fix-1311087-rgo
Merge into: lp:ocb-addons
Diff against target: 17 lines (+4/-2)
1 file modified
mail/mail_message.py (+4/-2)
To merge this branch: bzr merge lp:~camptocamp/ocb-addons/7.0-fix-1311087-rgo
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) Disapprove on 2014-11-24
Leonardo Pistone 2014-06-24 Approve on 2014-06-30
Review via email: mp+224247@code.launchpad.net

Description of the change

To post a comment you must log in.
Leonardo Pistone (lepistone) wrote :

Hi Yannick,

so this is already on the v7 on github. Now that OCB migration to github is in progress,
should we merge that in ocb on launchpad?

Other than that, I would approve the change.

Thanks!

review: Needs Information

Replay isn't working yet and passing from lp to github will make us having to replay all the MP we did.

I think that while we don't have OCB fully working on github we can fill the gap by merging that kind of MP in OCB on launchpad.

Please merge here on LP for the coming days, not on GitHub. The OCB branches will be overwritten by the final migration.

Leonardo Pistone (lepistone) wrote :

Thanks a lot Stefan.

review: Approve
Holger Brunn (Therp) (hbrunn) wrote :

Development for 7.0 has moved to github on https://github.com/OCA/ocb - please move your merge proposal there if it is still valid.

(I close and reject this in order to have a cleaner overview for 6.1 MPs which indeed have to be done on launchpad)

review: Disapprove

Unmerged revisions

10218. By Ravi Gohil (OpenERP) on 2014-06-24

[FIX] mail: speed improvement in the process of sending an email through 'Send by email' option, fix backported from trunk rev: 9345(issue reproduced with client's db which has 6 million records for 'subtype_ids' o2m table). (Maintenance Case: 606994)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mail/mail_message.py'
2--- mail/mail_message.py 2014-03-10 08:54:20 +0000
3+++ mail/mail_message.py 2014-06-24 08:43:01 +0000
4@@ -881,9 +881,11 @@
5 fol_ids = fol_obj.search(cr, SUPERUSER_ID, [
6 ('res_model', '=', message.model),
7 ('res_id', '=', message.res_id),
8- ('subtype_ids', 'in', message.subtype_id.id)
9 ], context=context)
10- partners_to_notify |= set(fo.partner_id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context))
11+ partners_to_notify |= set(
12+ fo.partner_id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context)
13+ if message.subtype_id.id in [st.id for st in fo.subtype_ids]
14+ )
15 # remove me from notified partners, unless the message is written on my own wall
16 if message.author_id and message.model == "res.partner" and message.res_id == message.author_id.id:
17 partners_to_notify |= set([message.author_id])