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

[MIG] base_user_role_company: Backport to 12.0

Browse Source
This commit is contained in:
Holger Brunn
2021-07-07 12:54:38 +02:00
parent 1b1d07171b
commit be8aff5bbf
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base_user_role_company/__manifest__.py
View File

@@ -3,7 +3,7 @@
{ {
"name": "User roles by company", "name": "User roles by company",
"version": "14.0.1.0.0", "version": "12.0.1.0.0",
"category": "Tools", "category": "Tools",
"author": "Open Source Integrators, Odoo Community Association (OCA)", "author": "Open Source Integrators, Odoo Community Association (OCA)",
"license": "AGPL-3", "license": "AGPL-3",

3
base_user_role_company/models/ir_http.py
View File

@@ -16,7 +16,8 @@ class IrHttp(models.AbstractModel):
""" """
result = super(IrHttp, self).session_info() result = super(IrHttp, self).session_info()
if self.env.user.role_line_ids: if self.env.user.role_line_ids:
cids_str = request.httprequest.cookies.get("cids", str(self.env.company.id)) cids_str = request.httprequest.cookies.get(
"cids", str(self.env.user.company_id.id))
cids = [int(cid) for cid in cids_str.split(",")] cids = [int(cid) for cid in cids_str.split(",")]
self.env.user._set_session_active_roles(cids) self.env.user._set_session_active_roles(cids)
self.env.user.set_groups_from_roles() self.env.user.set_groups_from_roles()

4
base_user_role_company/tests/test_role_per_company.py
View File

@@ -28,14 +28,14 @@ class TestUserRoleCompany(TransactionCase):
"login": "test_user", "login": "test_user",
"company_ids": [(6, 0, [self.company1.id, self.company2.id])], "company_ids": [(6, 0, [self.company1.id, self.company2.id])],
"role_line_ids": [ "role_line_ids": [
(0, 0, {"role_id": self.roleA.id}), (0, 0, {"role_id": self.roleA.id, "company_id": None}),
(0, 0, {"role_id": self.roleB.id, "company_id": self.company1.id}), (0, 0, {"role_id": self.roleB.id, "company_id": self.company1.id}),
(0, 0, {"role_id": self.roleC.id, "company_id": self.company1.id}), (0, 0, {"role_id": self.roleC.id, "company_id": self.company1.id}),
(0, 0, {"role_id": self.roleC.id, "company_id": self.company2.id}), (0, 0, {"role_id": self.roleC.id, "company_id": self.company2.id}),
], ],
} }
self.test_user = self.User.create(user_vals) self.test_user = self.User.create(user_vals)
self.User = self.User.with_user(self.test_user) self.User = self.User.sudo(self.test_user)
def test_110_company_1(self): def test_110_company_1(self):
"Company 1 selected: Tech and Settings roles are activated" "Company 1 selected: Tech and Settings roles are activated"