diff --git a/src/base/0.0.0/end-user_groups_view.py b/src/base/0.0.0/end-user_groups_view.py index f015fbcb..49f13716 100644 --- a/src/base/0.0.0/end-user_groups_view.py +++ b/src/base/0.0.0/end-user_groups_view.py @@ -3,4 +3,6 @@ def migrate(cr, version): + if util.version_gte("saas~18.2"): + return util.env(cr)["res.groups"]._update_user_groups_view() diff --git a/src/base/tests/test_util.py b/src/base/tests/test_util.py index f31ac54a..2da1be93 100644 --- a/src/base/tests/test_util.py +++ b/src/base/tests/test_util.py @@ -1626,15 +1626,16 @@ def test_m2m_no_conflict(self): mapping = {g1.id: g3.id, g2.id: g3.id} u1 = self.env["res.users"].create({"login": "U1", "name": "U1"}) - u1.groups_id = g1 | g3 - self.assertEqual(u1.groups_id.ids, [g1.id, g3.id]) + groups = "group_ids" if util.version_gte("saas~18.2") else "groups_id" + u1[groups] = g1 | g3 + self.assertEqual(u1[groups].ids, [g1.id, g3.id]) util.replace_record_references_batch(cr, mapping, "res.groups") util.invalidate(u1) - self.assertEqual(u1.groups_id.ids, [g3.id]) + self.assertEqual(u1[groups].ids, [g3.id]) u2 = self.env["res.users"].create({"login": "U2", "name": "U2"}) - u2.groups_id = g1 | g2 - self.assertEqual(u2.groups_id.ids, [g1.id, g2.id]) + u2[groups] = g1 | g2 + self.assertEqual(u2[groups].ids, [g1.id, g2.id]) util.replace_record_references_batch(cr, mapping, "res.groups") util.invalidate(u2) - self.assertEqual(u2.groups_id.ids, [g3.id]) + self.assertEqual(u2[groups].ids, [g3.id])