github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-19 18:34:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of github.com:jumpserver/jumpserver into dev

Browse Source
This commit is contained in:
ibuler
2016-04-05 11:18:54 +08:00
parent 1959c685b9 5814b833ed
commit 2dd16b91ec
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
connect.py
View File

@@ -470,7 +470,7 @@ class Nav(object):
gid = int(str_r.lstrip('g')) gid = int(str_r.lstrip('g'))
# 获取资产组包含的资产 # 获取资产组包含的资产
asset_group = get_object(AssetGroup, id=gid) asset_group = get_object(AssetGroup, id=gid)
if asset_group: if asset_group and asset_group in self.perm_asset_groups:
self.search_result = list(asset_group.asset_set.all()) self.search_result = list(asset_group.asset_set.all())
else: else:
color_print('没有该资产组或没有权限') color_print('没有该资产组或没有权限')