mirror of
https://github.com/OCA/server-backend.git
synced 2025-02-18 09:52:42 +02:00
[IMP] base_user_role: Added multicompany support from commit server-tool repo commit 840c2c1119460424230c935da24ec42f95c21122
This commit is contained in:
@@ -54,6 +54,14 @@ class ResUsers(models.Model):
|
||||
self.sudo().set_groups_from_roles()
|
||||
return res
|
||||
|
||||
def _get_applicable_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
|
||||
)
|
||||
)
|
||||
|
||||
@api.multi
|
||||
def set_groups_from_roles(self, force=False):
|
||||
"""Set (replace) the groups following the roles defined on users.
|
||||
@@ -75,10 +83,7 @@ class ResUsers(models.Model):
|
||||
if not user.role_line_ids and not force:
|
||||
continue
|
||||
group_ids = []
|
||||
role_lines = user.role_line_ids.filtered(
|
||||
lambda rec: rec.is_enabled
|
||||
)
|
||||
for role_line in role_lines:
|
||||
for role_line in user._get_applicable_roles():
|
||||
role = role_line.role_id
|
||||
if role:
|
||||
group_ids += role_groups[role]
|
||||
|
||||
Reference in New Issue
Block a user