github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-04 17:01:09 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ibuler
2022-12-16 15:54:29 +08:00
parent d040162d86 009669febe
commit 26fa1f6f08
20 changed files with 159 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/perms/api/user_permission/tree/node_with_asset.py
View File

@@ -158,7 +158,7 @@ class UserGrantedK8sAsTreeApi(SelfOrPKUserMixin, ListAPIView):
asset_id = parent_info.get('asset_id')
asset_id = tree_id if not asset_id else asset_id
if tree_id and not account_username:
if tree_id and not key and not account_username:
asset = self.asset(asset_id)
accounts = self.get_accounts(asset)
asset_node = KubernetesTree(tree_id).as_asset_tree_node(asset)
@@ -168,6 +168,6 @@ class UserGrantedK8sAsTreeApi(SelfOrPKUserMixin, ListAPIView):
account, parent_info,
)
tree.append(account_node)
else:
elif key and account_username:
tree = KubernetesTree(key).async_tree_node(parent_info)
return Response(data=tree)