From c46475f056fb28670f4ff216daff6445ad4659ff Mon Sep 17 00:00:00 2001 From: ArnauCForgeFlow Date: Thu, 25 Jan 2024 15:40:25 +0100 Subject: [PATCH] [FIX] base_user_role: renamed wizard name and use active_ids --- base_user_role/security/ir.model.access.csv | 2 +- base_user_role/tests/test_user_role.py | 4 ++-- base_user_role/wizards/group_groups_into_role.py | 4 ++-- base_user_role/wizards/group_groups_into_role.xml | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/base_user_role/security/ir.model.access.csv b/base_user_role/security/ir.model.access.csv index eb0ab401..1691f70d 100644 --- a/base_user_role/security/ir.model.access.csv +++ b/base_user_role/security/ir.model.access.csv @@ -1,4 +1,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_res_users_role,access_res_users_role,model_res_users_role,"base.group_erp_manager",1,1,1,1 access_res_users_role_line,access_res_users_role_line,model_res_users_role_line,"base.group_erp_manager",1,1,1,1 -access_group_groups_into_role,access_group_groups_into_role,model_group_groups_into_role,,1,1,1,1 +access_wizard_groups_into_role,access_wizard_groups_into_role,model_wizard_groups_into_role,,1,1,1,1 diff --git a/base_user_role/tests/test_user_role.py b/base_user_role/tests/test_user_role.py index 2eb50c9b..f494fc52 100644 --- a/base_user_role/tests/test_user_role.py +++ b/base_user_role/tests/test_user_role.py @@ -16,7 +16,7 @@ class TestUserRole(TransactionCase): ) cls.user_model = cls.env["res.users"] cls.role_model = cls.env["res.users.role"] - cls.wiz_model = cls.env["group.groups.into.role"] + cls.wiz_model = cls.env["wizard.groups.into.role"] cls.company1 = cls.env.ref("base.main_company") cls.company2 = cls.env["res.company"].create({"name": "company2"}) @@ -236,7 +236,7 @@ class TestUserRole(TransactionCase): # Check that there is not a role with name: Test Role self.assertFalse(self.role_model.search([("name", "=", "Test Role")])) # Call create_role function to group groups into a role - wizard = self.wiz_model.with_context(selected_group_ids=user_group_ids).create( + wizard = self.wiz_model.with_context(active_ids=user_group_ids).create( {"name": "Test Role"} ) wizard.create_role() diff --git a/base_user_role/wizards/group_groups_into_role.py b/base_user_role/wizards/group_groups_into_role.py index 8e68e8c3..ea286c11 100644 --- a/base_user_role/wizards/group_groups_into_role.py +++ b/base_user_role/wizards/group_groups_into_role.py @@ -10,7 +10,7 @@ class GroupGroupsIntoRole(models.TransientModel): This wizard is used to group different groups into a role. """ - _name = "group.groups.into.role" + _name = "wizard.groups.into.role" _description = "Group groups into a role" name = fields.Char( required=True, @@ -18,7 +18,7 @@ class GroupGroupsIntoRole(models.TransientModel): ) def create_role(self): - selected_group_ids = self.env.context.get("selected_group_ids", []) + selected_group_ids = self._context.get("active_ids", []) vals = { "name": self.name, "implied_ids": selected_group_ids, diff --git a/base_user_role/wizards/group_groups_into_role.xml b/base_user_role/wizards/group_groups_into_role.xml index 211f3844..2202db55 100644 --- a/base_user_role/wizards/group_groups_into_role.xml +++ b/base_user_role/wizards/group_groups_into_role.xml @@ -1,8 +1,8 @@ - group.groups.into.role.wiz.view - group.groups.into.role + wizard.groups.into.role.wiz.view + wizard.groups.into.role
@@ -29,10 +29,10 @@ action = { 'name': 'Specify a name for your new role', 'type': 'ir.actions.act_window', - 'res_model': 'group.groups.into.role', + 'res_model': 'wizard.groups.into.role', 'target': 'new', 'views':[(env.ref('base_user_role.group_groups_into_role_wiz_view').id, 'form')], - 'context': {'selected_group_ids': [group.id for group in records]}, + 'context': env.context }