github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 组件角色绑定错误

pull/8645/head
feng626 2022-07-21 15:31:56 +08:00 committed by 老广
parent 046356728a
commit 36d0b8d085
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/orgs/models.py
View File

@ -16,9 +16,14 @@ class OrgRoleMixin:
def add_member(self, user, role=None): def add_member(self, user, role=None):
from rbac.builtin import BuiltinRole from rbac.builtin import BuiltinRole
from .utils import tmp_to_org from .utils import tmp_to_org
role_id = BuiltinRole.org_user.id
if role: if role:
role_id = role.id role_id = role.id
elif user.is_service_account:
role_id = BuiltinRole.system_component.id
else:
role_id = BuiltinRole.org_user.id
with tmp_to_org(self): with tmp_to_org(self):
defaults = { defaults = {
'user': user, 'role_id': role_id, 'user': user, 'role_id': role_id,