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

fix: 修复 applet 账号选择问题

pull/10519/head
ibuler 2023-05-19 15:06:23 +08:00 committed by Jiangjie.Bai
parent a6b59ad7d6
commit e2602127c4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/ops/api/job.py
View File

@ -166,6 +166,7 @@ class UsernameHintsAPI(APIView):
top_accounts = Account.objects \ top_accounts = Account.objects \
.exclude(username__startswith='jms_') \ .exclude(username__startswith='jms_') \
.exclude(username__startswith='js_') \
.filter(username__icontains=query) \ .filter(username__icontains=query) \
.filter(asset__in=assets) \ .filter(asset__in=assets) \
.values('username') \ .values('username') \

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

@ -193,7 +193,7 @@ class Applet(JMSBaseModel):
if private_account and private_account.username not in accounts_username_used: if private_account and private_account.username not in accounts_username_used:
account = private_account account = private_account
else: else:
accounts = accounts.exclude(username__in=accounts_username_used) accounts = accounts.exclude(username__in=accounts_username_used).filter(username__startswith='jms_')
account = self.random_select_prefer_account(user, host, accounts) account = self.random_select_prefer_account(user, host, accounts)
if not account: if not account:
return return