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

fix: 修复用户角色由组织用户->组织管理员时从组织清除用户

pull/5763/head
Bai 2021-03-16 15:15:06 +08:00 committed by 老广
parent 1e85805ea3
commit adc607dafe
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/orgs/models.py
View File

@ -363,13 +363,7 @@ class OrgMemberManager(models.Manager):
if role in to_add: if role in to_add:
to_add[role].add(user) to_add[role].add(user)
self.remove_users_by_role( # 先添加再移除 (防止用户角色由组织用户->组织管理员时从组织清除用户)
org,
to_remove.users,
to_remove.admins,
to_remove.auditors
)
self.add_users_by_role( self.add_users_by_role(
org, org,
to_add.users, to_add.users,
@ -377,6 +371,13 @@ class OrgMemberManager(models.Manager):
to_add.auditors to_add.auditors
) )
self.remove_users_by_role(
org,
to_remove.users,
to_remove.admins,
to_remove.auditors
)
def set_users_by_role(self, org, users=None, admins=None, auditors=None): def set_users_by_role(self, org, users=None, admins=None, auditors=None):
""" """
给组织设置带角色的用户 给组织设置带角色的用户