[IMP] base_user_role: black

This commit is contained in:
Kevin Khao
2020-03-04 10:49:05 +01:00
parent 36ac13f336
commit d64b4123a9
4 changed files with 185 additions and 131 deletions

View File

@@ -10,34 +10,42 @@ _logger = logging.getLogger(__name__)
class ResUsersRole(models.Model):
_name = 'res.users.role'
_inherits = {'res.groups': 'group_id'}
_name = "res.users.role"
_inherits = {"res.groups": "group_id"}
_description = "User role"
group_id = fields.Many2one(
comodel_name='res.groups', required=True, ondelete='cascade',
readonly=True, string="Associated group")
line_ids = fields.One2many(
comodel_name='res.users.role.line',
inverse_name='role_id', string="Role lines")
user_ids = fields.One2many(
comodel_name='res.users', string="Users list",
compute='_compute_user_ids')
group_category_id = fields.Many2one(
related='group_id.category_id',
default=lambda cls: cls.env.ref(
'base_user_role.ir_module_category_role').id,
string="Associated category",
help="Associated group's category")
comment = fields.Html(
string="Internal Notes",
comodel_name="res.groups",
required=True,
ondelete="cascade",
readonly=True,
string="Associated group",
)
line_ids = fields.One2many(
comodel_name="res.users.role.line",
inverse_name="role_id",
string="Role lines",
)
user_ids = fields.One2many(
comodel_name="res.users",
string="Users list",
compute="_compute_user_ids",
)
group_category_id = fields.Many2one(
related="group_id.category_id",
default=lambda cls: cls.env.ref(
"base_user_role.ir_module_category_role"
).id,
string="Associated category",
help="Associated group's category",
)
comment = fields.Html(string="Internal Notes",)
@api.multi
@api.depends('line_ids.user_id')
@api.depends("line_ids.user_id")
def _compute_user_ids(self):
for role in self:
role.user_ids = role.line_ids.mapped('user_id')
role.user_ids = role.line_ids.mapped("user_id")
@api.model
def create(self, vals):
@@ -53,7 +61,7 @@ class ResUsersRole(models.Model):
@api.multi
def unlink(self):
users = self.mapped('user_ids')
users = self.mapped("user_ids")
res = super(ResUsersRole, self).unlink()
users.set_groups_from_roles(force=True)
return res
@@ -61,7 +69,7 @@ class ResUsersRole(models.Model):
@api.multi
def update_users(self):
"""Update all the users concerned by the roles identified by `ids`."""
users = self.mapped('user_ids')
users = self.mapped("user_ids")
users.set_groups_from_roles()
return True
@@ -72,20 +80,19 @@ class ResUsersRole(models.Model):
class ResUsersRoleLine(models.Model):
_name = 'res.users.role.line'
_description = 'Users associated to a role'
_name = "res.users.role.line"
_description = "Users associated to a role"
role_id = fields.Many2one(
comodel_name='res.users.role', string="Role",
ondelete='cascade')
user_id = fields.Many2one(
comodel_name='res.users', string="User")
comodel_name="res.users.role", string="Role", ondelete="cascade"
)
user_id = fields.Many2one(comodel_name="res.users", string="User")
date_from = fields.Date("From")
date_to = fields.Date("To")
is_enabled = fields.Boolean("Enabled", compute='_compute_is_enabled')
is_enabled = fields.Boolean("Enabled", compute="_compute_is_enabled")
@api.multi
@api.depends('date_from', 'date_to')
@api.depends("date_from", "date_to")
def _compute_is_enabled(self):
today = datetime.date.today()
for role_line in self:
@@ -101,7 +108,7 @@ class ResUsersRoleLine(models.Model):
@api.multi
def unlink(self):
users = self.mapped('user_id')
users = self.mapped("user_id")
res = super(ResUsersRoleLine, self).unlink()
users.set_groups_from_roles(force=True)
return res

View File

@@ -4,38 +4,43 @@ from odoo import api, fields, models
class ResUsers(models.Model):
_inherit = 'res.users'
_inherit = "res.users"
role_line_ids = fields.One2many(
comodel_name='res.users.role.line',
inverse_name='user_id',
comodel_name="res.users.role.line",
inverse_name="user_id",
string="Role lines",
default=lambda self: self._default_role_lines()
default=lambda self: self._default_role_lines(),
)
role_ids = fields.One2many(
comodel_name='res.users.role', string="Roles",
compute='_compute_role_ids')
comodel_name="res.users.role",
string="Roles",
compute="_compute_role_ids",
)
@api.model
def _default_role_lines(self):
default_user = self.env.ref(
'base.default_user', raise_if_not_found=False)
"base.default_user", raise_if_not_found=False
)
default_values = []
if default_user:
for role_line in default_user.role_line_ids:
default_values.append({
'role_id': role_line.role_id.id,
'date_from': role_line.date_from,
'date_to': role_line.date_to,
'is_enabled': role_line.is_enabled,
})
default_values.append(
{
"role_id": role_line.role_id.id,
"date_from": role_line.date_from,
"date_to": role_line.date_to,
"is_enabled": role_line.is_enabled,
}
)
return default_values
@api.multi
@api.depends('role_line_ids.role_id')
@api.depends("role_line_ids.role_id")
def _compute_role_ids(self):
for user in self:
user.role_ids = user.role_line_ids.mapped('role_id')
user.role_ids = user.role_line_ids.mapped("role_id")
@api.model
def create(self, vals):
@@ -58,21 +63,26 @@ class ResUsers(models.Model):
role_groups = {}
# We obtain all the groups associated to each role first, so that
# it is faster to compare later with each user's groups.
for role in self.mapped('role_line_ids.role_id'):
role_groups[role] = list(set(
role.group_id.ids + role.implied_ids.ids +
role.trans_implied_ids.ids))
for role in self.mapped("role_line_ids.role_id"):
role_groups[role] = list(
set(
role.group_id.ids
+ role.implied_ids.ids
+ role.trans_implied_ids.ids
)
)
for user in self:
if not user.role_line_ids and not force:
continue
group_ids = []
role_lines = user.role_line_ids.filtered(
lambda rec: rec.is_enabled)
lambda rec: rec.is_enabled
)
for role_line in role_lines:
role = role_line.role_id
if role:
group_ids += role_groups[role]
group_ids = list(set(group_ids)) # Remove duplicates IDs
group_ids = list(set(group_ids)) # Remove duplicates IDs
groups_to_add = list(set(group_ids) - set(user.groups_id.ids))
groups_to_remove = list(set(user.groups_id.ids) - set(group_ids))
to_add = [(4, gr) for gr in groups_to_add]
@@ -80,7 +90,7 @@ class ResUsers(models.Model):
groups = to_remove + to_add
if groups:
vals = {
'groups_id': groups,
"groups_id": groups,
}
super(ResUsers, user).write(vals)
return True