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

Merge pull request #5032 from jumpserver/dev 

fix(assets): 修复获取org_root的问题
pull/5041/head
Jiangjie.Bai 2020-11-18 11:29:53 +08:00 committed by GitHub
parent 49dd611292 6ec0b3ad54
commit 177055acdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/assets/models/node.py
View File

@ -352,7 +352,9 @@ class SomeNodesMixin:
@classmethod @classmethod
def org_root(cls): def org_root(cls):
root = cls.objects.filter(parent_key='').exclude(key__startswith='-') root = cls.objects.filter(parent_key='')\
.filter(key__regex=r'^[0-9]+$')\
.exclude(key__startswith='-')
if root: if root:
return root[0] return root[0]
else: else: