audrius/server-backend
1
0
Fork 0
mirror of https://github.com/OCA/server-backend.git synced 2025-02-18 09:52:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP/FIX] base_user_role_company - re-add logic around multi active cids

Browse Source
This commit is contained in:
Jérémy Didderen
2023-10-05 12:07:23 +02:00
parent e428fdde7b
commit ac241f009b
4 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
base_user_role_company/models/ir_http.py
View File

@@ -18,6 +18,5 @@ class IrHttp(models.AbstractModel):
if self.env.user.role_line_ids:
cids_str = request.httprequest.cookies.get("cids", str(self.env.company.id))
cids = [int(cid) for cid in cids_str.split(",")]
# The first element of cids is the currently selected company
self.env.user.set_groups_from_roles(company_id=cids[0])
self.env.user.with_context(active_company_ids=cids).set_groups_from_roles()
return result

26
base_user_role_company/models/user.py
View File

@@ -21,15 +21,21 @@ class ResUsers(models.Model):
def _get_enabled_roles(self):
res = super()._get_enabled_roles()
# Enable only the Roles corresponing to the currently selected company
if self.role_line_ids:
res = res.filtered(
lambda x: not x.company_id or x.company_id == self.env.company
)
active_roles = self.env["res.users.role.line"]
if self.env.context.get("active_company_ids"):
company_ids = self.env.context.get("active_company_ids")
else:
company_ids = self.company_id.ids
for role_line in self.role_line_ids:
if not role_line.company_id:
active_roles |= role_line
elif role_line.company_id.id in company_ids:
role_line_companies = self.role_line_ids.filtered(
lambda x: x.role_id == role_line.role_id
and x.company_id.id in company_ids
)
if len(role_line_companies) == len(company_ids):
active_roles |= role_line
return active_roles
return res
def set_groups_from_roles(self, force=False, company_id=False):
# When using the Company Switcher widget, the self.env.company is not yet set
if company_id:
self = self.with_company(company_id)
return super().set_groups_from_roles(force=force)