mirror of
https://github.com/OCA/server-backend.git
synced 2025-02-18 09:52:42 +02:00
[IMP] base_user_role: black, isort
This commit is contained in:
committed by
Tatiana Deribina
parent
5fe8627d50
commit
1d9d0b4255
@@ -4,37 +4,38 @@ 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)
|
||||
default_user = self.env.ref("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.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):
|
||||
@@ -49,8 +50,9 @@ class ResUsers(models.Model):
|
||||
|
||||
def _get_enabled_roles(self):
|
||||
return self.role_line_ids.filtered(
|
||||
lambda rec: rec.is_enabled and
|
||||
(not rec.company_id or rec.company_id == rec.user_id.company_id))
|
||||
lambda rec: rec.is_enabled
|
||||
and (not rec.company_id or rec.company_id == rec.user_id.company_id)
|
||||
)
|
||||
|
||||
def set_groups_from_roles(self, force=False):
|
||||
"""Set (replace) the groups following the roles defined on users.
|
||||
@@ -60,10 +62,14 @@ 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
|
||||
@@ -71,15 +77,13 @@ class ResUsers(models.Model):
|
||||
for role_line in user._get_enabled_roles():
|
||||
role = role_line.role_id
|
||||
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]
|
||||
to_remove = [(3, gr) for gr in groups_to_remove]
|
||||
groups = to_remove + to_add
|
||||
if groups:
|
||||
vals = {
|
||||
'groups_id': groups,
|
||||
}
|
||||
vals = {"groups_id": groups}
|
||||
super(ResUsers, user).write(vals)
|
||||
return True
|
||||
|
||||
Reference in New Issue
Block a user