mirror of
https://github.com/OCA/server-backend.git
synced 2025-02-18 09:52:42 +02:00
[FIX] base_user_role: renamed wizard name and use active_ids
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
|
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,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_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
|
||||||
|
|||||||
|
@@ -16,7 +16,7 @@ class TestUserRole(TransactionCase):
|
|||||||
)
|
)
|
||||||
cls.user_model = cls.env["res.users"]
|
cls.user_model = cls.env["res.users"]
|
||||||
cls.role_model = cls.env["res.users.role"]
|
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.company1 = cls.env.ref("base.main_company")
|
||||||
cls.company2 = cls.env["res.company"].create({"name": "company2"})
|
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
|
# Check that there is not a role with name: Test Role
|
||||||
self.assertFalse(self.role_model.search([("name", "=", "Test Role")]))
|
self.assertFalse(self.role_model.search([("name", "=", "Test Role")]))
|
||||||
# Call create_role function to group groups into a 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"}
|
{"name": "Test Role"}
|
||||||
)
|
)
|
||||||
wizard.create_role()
|
wizard.create_role()
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ class GroupGroupsIntoRole(models.TransientModel):
|
|||||||
This wizard is used to group different groups into a role.
|
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"
|
_description = "Group groups into a role"
|
||||||
name = fields.Char(
|
name = fields.Char(
|
||||||
required=True,
|
required=True,
|
||||||
@@ -18,7 +18,7 @@ class GroupGroupsIntoRole(models.TransientModel):
|
|||||||
)
|
)
|
||||||
|
|
||||||
def create_role(self):
|
def create_role(self):
|
||||||
selected_group_ids = self.env.context.get("selected_group_ids", [])
|
selected_group_ids = self._context.get("active_ids", [])
|
||||||
vals = {
|
vals = {
|
||||||
"name": self.name,
|
"name": self.name,
|
||||||
"implied_ids": selected_group_ids,
|
"implied_ids": selected_group_ids,
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<odoo>
|
<odoo>
|
||||||
<record id="group_groups_into_role_wiz_view" model="ir.ui.view">
|
<record id="group_groups_into_role_wiz_view" model="ir.ui.view">
|
||||||
<field name="name">group.groups.into.role.wiz.view</field>
|
<field name="name">wizard.groups.into.role.wiz.view</field>
|
||||||
<field name="model">group.groups.into.role</field>
|
<field name="model">wizard.groups.into.role</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<form>
|
<form>
|
||||||
<group>
|
<group>
|
||||||
@@ -29,10 +29,10 @@
|
|||||||
action = {
|
action = {
|
||||||
'name': 'Specify a name for your new role',
|
'name': 'Specify a name for your new role',
|
||||||
'type': 'ir.actions.act_window',
|
'type': 'ir.actions.act_window',
|
||||||
'res_model': 'group.groups.into.role',
|
'res_model': 'wizard.groups.into.role',
|
||||||
'target': 'new',
|
'target': 'new',
|
||||||
'views':[(env.ref('base_user_role.group_groups_into_role_wiz_view').id, 'form')],
|
'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
|
||||||
}
|
}
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|||||||
Reference in New Issue
Block a user