github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-15 23:08:20 +00:00
Code Issues Projects Releases Wiki Activity

perf(orgs): 默认组织改为实体组织，并支持全局组织 (#5617)

Browse Source 
* perf(orgs): 默认组织改为实体组织

* perf: 添加获取当前组织信息的api

* perf: 资产列表在 root 组织下的表现

* fix: 修复 root 组织引起的问题

* perf: 优化OrgModelMixin save; org_root获取; org_roles获取; UserCanUseCurrentOrg权限类

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Bai <bugatti_it@163.com>
This commit is contained in:
fit2bot
2021-03-02 14:57:48 +08:00
committed by GitHub
parent 51c9a89b1f
commit a56ac7b34e
19 changed files with 381 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/users/models/user.py
View File

@@ -169,20 +169,21 @@ class RoleMixin:
def org_roles(self):
from orgs.models import ROLE as ORG_ROLE
if not current_org.is_real():
# 不是真实的组织，取 User 本身的角色
if current_org.is_root():
# root 组织, 取 User 本身的角色
if self.is_superuser:
return [ORG_ROLE.ADMIN]
roles = [ORG_ROLE.ADMIN]
elif self.is_super_auditor:
roles = [ORG_ROLE.AUDITOR]
else:
return [ORG_ROLE.USER]
# 是真实组织，取 OrganizationMember 中的角色
roles = [
org_member.role
for org_member in self.m2m_org_members.all()
if org_member.org_id == current_org.id
]
roles.sort()
roles = [ORG_ROLE.USER]
else:
# 是真实组织, 取 OrganizationMember 中的角色
roles = [
org_member.role for org_member in self.m2m_org_members.all()
if org_member.org_id == current_org.id
]
roles.sort()
return roles
@lazyproperty
@@ -202,7 +203,7 @@ class RoleMixin:
def current_org_roles(self):
from orgs.models import OrganizationMember, ROLE as ORG_ROLE
if not current_org.is_real():
if current_org.is_root():
if self.is_superuser:
return [ORG_ROLE.ADMIN]
else:
@@ -297,7 +298,7 @@ class RoleMixin:
@lazyproperty
def can_user_current_org(self):
return current_org.can_user_by(self)
return current_org.can_use_by(self)
@lazyproperty
def can_admin_or_audit_current_org(self):
@@ -325,7 +326,7 @@ class RoleMixin:
return app, access_key
def remove(self):
if not current_org.is_real():
if current_org.is_root():
return
org = Organization.get_instance(current_org.id)
OrganizationMember.objects.remove_users(org, [self])