github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-19 01:45:27 +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

2
apps/terminal/models/session.py
View File

@@ -168,7 +168,7 @@ class Session(OrgModelMixin):
from common.utils.random import random_datetime, random_ip
org = get_current_org()
if not org or not org.is_real():
if not org or org.is_root():
Organization.default().change_to()
i = 0
users = User.objects.all()[:100]