summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-04-12 12:58:19 +0200
committerChristophe Simonis <chs@odoo.com>2017-04-12 12:58:19 +0200
commitf10ef71f068ce665316d2a1dff6b2cd33a2e001f (patch)
treed148bdda29a0102daa11b2a122335926669fc279
parenteb9b888c5ab7dd9f7e6d7abec4c9b406b57ae798 (diff)
parent87b21d19eb9a8947a48f46d8f32f1f690eae3ed4 (diff)
[MERGE] forward port branch saas-6 up to 87b21d19eb9
-rw-r--r--openerp/addons/base/ir/ir_rule.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/openerp/addons/base/ir/ir_rule.py b/openerp/addons/base/ir/ir_rule.py
index fbb6e250d56..ecf381bc0a5 100644
--- a/openerp/addons/base/ir/ir_rule.py
+++ b/openerp/addons/base/ir/ir_rule.py
@@ -111,9 +111,8 @@ class ir_rule(osv.osv):
# read 'domain' as UID to have the correct eval context for the rule.
rule_domain = self.read(cr, uid, [rule.id], ['domain'])[0]['domain']
dom = expression.normalize_domain(rule_domain)
- for group in rule.groups:
- if group in user.groups_id:
- group_domains.setdefault(group, []).append(dom)
+ if rule.groups & user.groups_id:
+ group_domains.setdefault(rule.groups[0], []).append(dom)
if not rule.groups:
global_domains.append(dom)
# combine global domains and group domains