From 8e44a19b47cf7f1537d2c7c46aa992225b4a25b9 Mon Sep 17 00:00:00 2001 From: Raf Ven Date: Wed, 13 Dec 2023 15:00:48 +0100 Subject: [PATCH] [MIG] base_user_role: Migration to 17.0 --- base_user_role/__manifest__.py | 2 +- base_user_role/models/role.py | 4 ++-- base_user_role/models/user.py | 4 ++-- base_user_role/tests/test_user_role.py | 4 ++-- base_user_role/views/group.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base_user_role/__manifest__.py b/base_user_role/__manifest__.py index f9f7ea3d..6247e91e 100644 --- a/base_user_role/__manifest__.py +++ b/base_user_role/__manifest__.py @@ -4,7 +4,7 @@ { "name": "User roles", - "version": "16.0.1.2.2", + "version": "17.0.1.0.0", "category": "Tools", "author": "ABF OSIELL, Odoo Community Association (OCA)", "license": "LGPL-3", diff --git a/base_user_role/models/role.py b/base_user_role/models/role.py index 739782a4..07796159 100644 --- a/base_user_role/models/role.py +++ b/base_user_role/models/role.py @@ -99,7 +99,7 @@ class ResUsersRole(models.Model): def unlink(self): users = self.mapped("user_ids") - res = super(ResUsersRole, self).unlink() + res = super().unlink() users.set_groups_from_roles(force=True) return res @@ -172,6 +172,6 @@ class ResUsersRoleLine(models.Model): def unlink(self): users = self.mapped("user_id") - res = super(ResUsersRoleLine, self).unlink() + res = super().unlink() users.set_groups_from_roles(force=True) return res diff --git a/base_user_role/models/user.py b/base_user_role/models/user.py index 4070c751..9b71e140 100644 --- a/base_user_role/models/user.py +++ b/base_user_role/models/user.py @@ -42,12 +42,12 @@ class ResUsers(models.Model): @api.model_create_multi def create(self, vals_list): - new_records = super(ResUsers, self).create(vals_list) + new_records = super().create(vals_list) new_records.set_groups_from_roles() return new_records def write(self, vals): - res = super(ResUsers, self).write(vals) + res = super().write(vals) self.sudo().set_groups_from_roles() return res diff --git a/base_user_role/tests/test_user_role.py b/base_user_role/tests/test_user_role.py index dede38e1..c2107170 100644 --- a/base_user_role/tests/test_user_role.py +++ b/base_user_role/tests/test_user_role.py @@ -180,13 +180,13 @@ class TestUserRole(TransactionCase): ) # Remove role2 from the user self.user_id.role_line_ids.filtered( - lambda l: l.role_id.id == self.role2_id.id + lambda rl: rl.role_id.id == self.role2_id.id ).unlink() user_group_ids = sorted({group.id for group in self.user_id.groups_id}) self.assertEqual(user_group_ids, role1_group_ids) # Remove role1 from the user self.user_id.role_line_ids.filtered( - lambda l: l.role_id.id == self.role1_id.id + lambda rl: rl.role_id.id == self.role1_id.id ).unlink() user_group_ids = sorted({group.id for group in self.user_id.groups_id}) self.assertEqual(user_group_ids, []) diff --git a/base_user_role/views/group.xml b/base_user_role/views/group.xml index c3c56af6..99d5ca92 100644 --- a/base_user_role/views/group.xml +++ b/base_user_role/views/group.xml @@ -12,7 +12,7 @@ name="action_view_roles" type="object" icon="fa-gears" - attrs="{'invisible': [ ('role_count', '=', 0)]}" + invisible="not role_count" >