Skip to content

Commit 46a9980

Browse files
Gorashrco-odoo
authored andcommitted
[IMP] base/saas~18.2: rename field group_ids & users
Task: 4166361 & 4341594 related: odoo/odoo#179354 odoo/upgrade#6841 odoo/enterprise#74122 closes #169 Related: odoo/odoo#179354 Related: odoo/enterprise#74122 Related: odoo/upgrade#6841 Signed-off-by: Raphael Collet <[email protected]>
1 parent a4296b9 commit 46a9980

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

src/base/0.0.0/end-user_groups_view.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33

44

55
def migrate(cr, version):
6+
if util.version_gte("saas~18.2"):
7+
return
68
util.env(cr)["res.groups"]._update_user_groups_view()

src/base/tests/test_util.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1652,15 +1652,16 @@ def test_m2m_no_conflict(self):
16521652
mapping = {g1.id: g3.id, g2.id: g3.id}
16531653

16541654
u1 = self.env["res.users"].create({"login": "U1", "name": "U1"})
1655-
u1.groups_id = g1 | g3
1656-
self.assertEqual(u1.groups_id.ids, [g1.id, g3.id])
1655+
groups = "group_ids" if util.version_gte("saas~18.2") else "groups_id"
1656+
u1[groups] = g1 | g3
1657+
self.assertEqual(u1[groups].ids, [g1.id, g3.id])
16571658
util.replace_record_references_batch(cr, mapping, "res.groups")
16581659
util.invalidate(u1)
1659-
self.assertEqual(u1.groups_id.ids, [g3.id])
1660+
self.assertEqual(u1[groups].ids, [g3.id])
16601661

16611662
u2 = self.env["res.users"].create({"login": "U2", "name": "U2"})
1662-
u2.groups_id = g1 | g2
1663-
self.assertEqual(u2.groups_id.ids, [g1.id, g2.id])
1663+
u2[groups] = g1 | g2
1664+
self.assertEqual(u2[groups].ids, [g1.id, g2.id])
16641665
util.replace_record_references_batch(cr, mapping, "res.groups")
16651666
util.invalidate(u2)
1666-
self.assertEqual(u2.groups_id.ids, [g3.id])
1667+
self.assertEqual(u2[groups].ids, [g3.id])

0 commit comments

Comments
 (0)