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

perf: 修改同名账号登录报错

pull/12402/head
ibuler 2023-12-21 14:02:24 +08:00 committed by 老广
parent ca026040fe
commit a38624d198
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/accounts/models/account.py
View File

@ -73,7 +73,11 @@ class Account(AbsConnectivity, LabeledMixin, BaseAccount):
] ]
def __str__(self): def __str__(self):
return '{}({})'.format(self.name, self.asset.name) if self.asset_id:
host = self.asset.name
else:
host = 'Dynamic'
return '{}({})'.format(self.name, host)
@lazyproperty @lazyproperty
def platform(self): def platform(self):

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

@ -301,7 +301,7 @@ class Applet(JMSBaseModel):
'account': account, 'account': account,
'lock_key': lock_key 'lock_key': lock_key
} }
logger.debug('Select host and account: {}'.format(res)) logger.debug('Select host and account: {}-{}'.format(host.name, account.username))
return res return res
def delete(self, using=None, keep_parents=False): def delete(self, using=None, keep_parents=False):