[MERGE] forward port branch saas-6 up to 87b21d19eb

This commit is contained in:
Christophe Simonis
2017-04-12 12:58:19 +02:00
+2 -3
View File
@@ -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