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

fix: 修复账号搜索 5xx (#6413) 

Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: Jiangjie.Bai <32935519+BaiJiangJie@users.noreply.github.com>
pull/6416/head
fit2bot 2021-07-12 18:20:32 +08:00 committed by GitHub
parent 898b51c593
commit 4f23090a5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/assets/models/authbook.py
View File

@ -63,6 +63,12 @@ class AuthBook(BaseUser, AbsConnectivity):
def username_display(self): def username_display(self):
return self.get_or_systemuser_attr('username') or '*' return self.get_or_systemuser_attr('username') or '*'
@property
def systemuser_display(self):
if not self.systemuser:
return ''
return str(self.systemuser)
@property @property
def smart_name(self): def smart_name(self):
username = self.username_display username = self.username_display

2
apps/assets/serializers/account.py
View File

@ -17,7 +17,7 @@ class AccountSerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer):
fields_write_only = ['password', 'private_key', "public_key"] fields_write_only = ['password', 'private_key', "public_key"]
fields_other = ['date_created', 'date_updated', 'connectivity', 'date_verified', 'comment'] fields_other = ['date_created', 'date_updated', 'connectivity', 'date_verified', 'comment']
fields_small = fields_mini + fields_write_only + fields_other fields_small = fields_mini + fields_write_only + fields_other
fields_fk = ['asset', 'systemuser'] fields_fk = ['asset', 'systemuser', 'systemuser_display']
fields = fields_small + fields_fk fields = fields_small + fields_fk
extra_kwargs = { extra_kwargs = {
'username': {'required': True}, 'username': {'required': True},