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

perf: 修改用户序列类 can_public_key_auth 类型; 修改 OPTION 获取字段 id label 为 ID

pull/9244/head
Bai 2022-12-26 19:16:11 +08:00
parent d2ba7a98ea
commit d0f70f4316
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/common/drf/metadata.py
View File

@ -122,6 +122,10 @@ class SimpleMetadataWithFilters(SimpleMetadata):
self.set_tree_field(field, field_info) self.set_tree_field(field, field_info)
elif isinstance(field, serializers.ChoiceField): elif isinstance(field, serializers.ChoiceField):
self.set_choices_field(field, field_info) self.set_choices_field(field, field_info)
if field.field_name == 'id':
field_info['label'] = 'ID'
return field_info return field_info
@staticmethod @staticmethod

5
apps/users/serializers/user.py
View File

@ -83,8 +83,9 @@ class UserSerializer(RolesSerializerMixin, CommonBulkSerializerMixin, serializer
) )
login_blocked = serializers.BooleanField(read_only=True, label=_("Login blocked")) login_blocked = serializers.BooleanField(read_only=True, label=_("Login blocked"))
is_expired = serializers.BooleanField(read_only=True, label=_("Is expired")) is_expired = serializers.BooleanField(read_only=True, label=_("Is expired"))
can_public_key_auth = serializers.ReadOnlyField( can_public_key_auth = serializers.BooleanField(
source="can_use_ssh_key_login", label=_("Can public key authentication") source="can_use_ssh_key_login", label=_("Can public key authentication"),
read_only=True
) )
password = EncryptedField( password = EncryptedField(
label=_("Password"), label=_("Password"),