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

Merge pull request #11292 from jumpserver/pr@dev@k8s_add_icon 

perf: 修改 k8s icon
pull/11295/head
老广 2023-08-16 13:44:51 +08:00 committed by GitHub
parent cd5e53e3dc ceee2e1633
commit 16ceb79427
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/utils/k8s.py
View File

@ -105,7 +105,7 @@ class KubernetesTree:
i = str(self.asset.id)
name = str(self.asset)
node = self.create_tree_node(
i, i, name, 'asset', is_open=True,
i, i, name, 'asset', icon='k8s', is_open=True,
)
return node

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

@ -228,9 +228,8 @@ class UserGrantedK8sAsTreeApi(SelfOrPKUserMixin, ListAPIView):
util = PermAccountUtil()
accounts = util.get_permed_accounts_for_user(self.user, token.asset)
account_name = token.account
if account_name in [
AliasAccount.INPUT, AliasAccount.USER
]:
if account_name in [AliasAccount.INPUT, AliasAccount.USER]:
return token.input_secret
else:
accounts = filter(lambda x: x.name == account_name, accounts)