summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-01-10 16:59:00 +0100
committerChristophe Simonis <chs@odoo.com>2019-01-10 16:59:00 +0100
commit9878db14f5c79ca0d0c2bd431588d3dceefe385d (patch)
tree6ef495bd2420c47146f8542e018f7047c2c238e2
parent96e800703bc09b2d4932c0f551787ef4816b4551 (diff)
parenta449b063b0d55fdb3ae58d51c3b295a586c6d549 (diff)
[MERGE] forward port branch saas-14 up to a449b063b0d
-rw-r--r--odoo/addons/base/res/res_users.py22
1 files changed, 20 insertions, 2 deletions
diff --git a/odoo/addons/base/res/res_users.py b/odoo/addons/base/res/res_users.py
index b546384f57e..0e221361f30 100644
--- a/odoo/addons/base/res/res_users.py
+++ b/odoo/addons/base/res/res_users.py
@@ -662,8 +662,26 @@ class GroupsImplied(models.Model):
if values.get('users') or values.get('implied_ids'):
# add all implied groups (to all users of each group)
for group in self:
- vals = {'users': zip(repeat(4), group.with_context(active_test=False).users.ids)}
- super(GroupsImplied, group.trans_implied_ids).write(vals)
+ self._cr.execute("""
+ WITH RECURSIVE group_imply(gid, hid) AS (
+ SELECT gid, hid
+ FROM res_groups_implied_rel
+ UNION
+ SELECT i.gid, r.hid
+ FROM res_groups_implied_rel r
+ JOIN group_imply i ON (i.hid = r.gid)
+ )
+ INSERT INTO res_groups_users_rel (gid, uid)
+ SELECT i.hid, r.uid
+ FROM group_imply i, res_groups_users_rel r
+ WHERE r.gid = i.gid
+ AND i.gid = %(gid)s
+ EXCEPT
+ SELECT r.gid, r.uid
+ FROM res_groups_users_rel r
+ JOIN group_imply i ON (r.gid = i.hid)
+ WHERE i.gid = %(gid)s
+ """, dict(gid=group.id))
return res