Merge lp:~openerp-dev/openobject-server/6.0-opw-5692-ach into lp:openobject-server/6.0

[Anup(SerpentCS)]

Hello,

   This fixes the issue. Now the domains of the record rules are being ANDed instead of ORing.

   Please Share your views.

Thanks.

[lp:~openerp-dev/openobject-server/6.0-opw-5692-ach]

3425. By Launchpad Translations on behalf of openerp on 2011-05-17

Launchpad automatic translations update.

3426. By Launchpad Translations on behalf of openerp on 2011-05-18

Launchpad automatic translations update.

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi,

revision <email address hidden> does not solve the problem, and seems to change the meaning of group membership in an unacceptable way. See my comment on the issue:

https://bugs.launchpad.net/openobject-server/+bug/766982/comments/13

Cheers,
Stefan.

[Olivier Dony (Odoo) (odo-openerp)]

I agree with Stefan, this is definitely not correct. The issue is not about changing the semantics of the combination of rules, it is only about being sure a user does not get rules applied from a group he does not actually belong to.

As Lorenzo explained in the bug report, at line 117 there is an iteration on the rule's groups, but obviously this could include groups the user does not belong to! So we just need to filter out the groups that are irrelevant to the user.

For example, say you have user U1 who belongs to group G1, and say rule R1 is linked to groups G1 and G2. When iterating on R1's groups for user U1, we will see G1 _and_ G2, and consider U1 a member of both groups, which leads to mistakes.

This is better explained with code, so here's an unverified, dumb patch to illustrate the desired result:
=== modified file 'bin/addons/base/ir/ir_rule.py'
--- bin/addons/base/ir/ir_rule.py 2011-03-02 11:08:16 +0000
+++ bin/addons/base/ir/ir_rule.py 2011-05-18 12:25:41 +0000
@@ -115,7 +115,9 @@
         if ids:
             for rule in self.browse(cr, uid, ids):
                 for group in rule.groups:
- group_rule.setdefault(group.id, []).append(rule.id)
+ # filter out irrelevant groups!
+ if uid in [u.id for u in group.users]:
+ group_rule.setdefault(group.id, []).append(rule.id)
                 if not rule.groups:
                   global_rules.append(rule.id)
             global_domain = self.domain_create(cr, uid, global_rules)

review: Needs Fixing

[lp:~openerp-dev/openobject-server/6.0-opw-5692-ach]

3427. By Launchpad Translations on behalf of openerp on 2011-05-19

Launchpad automatic translations update.

3428. By Launchpad Translations on behalf of openerp on 2011-05-20

Launchpad automatic translations update.

3429. By Launchpad Translations on behalf of openerp on 2011-05-21

Launchpad automatic translations update.

3430. By Launchpad Translations on behalf of openerp on 2011-05-22

Launchpad automatic translations update.

3431. By Launchpad Translations on behalf of openerp on 2011-05-23

Launchpad automatic translations update.

[Lorenzo Battistini (elbati)]

I agree with Olivier and Stefan :-)

[Stephane Wirtel (OpenERP) (stephane-openerp)]

I asked to Anup to recheck the code of his branch.

Thank you for your feedback.

Stéphane

[lp:~openerp-dev/openobject-server/6.0-opw-5692-ach]

3432. By Anup(SerpentCS) on 2011-05-23

[FIX] base : Improved the Group Rule process

[Anup(SerpentCS) (anup-serpent)]

Hello Everyone,

   I do agree with the discussion. I have corrected my code with the fruitful suggestions provided by you all.

   @Olivier, I have checked by applying the fix suggested by you. It works the way it's desired. Can you please double check the things?

Thanks a lot for your participation.

[Olivier Dony (Odoo) (odo-openerp)]

This is all good for me now, thanks! :-)

review: Approve

[Lorenzo Battistini (elbati)]

It works for me ;-)

review: Approve

[Lorenzo Battistini (elbati)]

Hi there, when will it be merged?

=== modified file 'bin/addons/base/ir/ir_rule.py'
--- bin/addons/base/ir/ir_rule.py	2011-03-02 11:08:16 +0000
+++ bin/addons/base/ir/ir_rule.py	2011-05-23 13:42:00 +0000
@@ -115,7 +115,8 @@
         if ids:
             for rule in self.browse(cr, uid, ids):
                 for group in rule.groups:
-                    group_rule.setdefault(group.id, []).append(rule.id)
+                    if uid in [u.id for u in group.users]:
+                        group_rule.setdefault(group.id, []).append(rule.id)
                 if not rule.groups:
                   global_rules.append(rule.id)
             global_domain = self.domain_create(cr, uid, global_rules)