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

perf: 修改 account serializer

pull/8873/head
ibuler 2022-09-13 21:18:04 +08:00
parent 4fcbdfa3f4
commit ae189ebdfe
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,8 @@ from rest_framework import serializers
from orgs.mixins.serializers import BulkOrgResourceModelSerializer from orgs.mixins.serializers import BulkOrgResourceModelSerializer
from common.drf.serializers import SecretReadableMixin from common.drf.serializers import SecretReadableMixin
from assets.models import Account, AccountTemplate from common.drf.fields import ObjectRelatedField
from assets.models import Account, AccountTemplate, Asset
from assets.serializers.base import AuthValidateMixin from assets.serializers.base import AuthValidateMixin
from .common import AccountFieldsSerializerMixin from .common import AccountFieldsSerializerMixin
@ -57,9 +58,7 @@ class AccountSerializer(AuthValidateMixin,
AccountSerializerCreateMixin, AccountSerializerCreateMixin,
AccountFieldsSerializerMixin, AccountFieldsSerializerMixin,
BulkOrgResourceModelSerializer): BulkOrgResourceModelSerializer):
name = serializers.CharField(max_length=128, read_only=True, label=_("Name")) asset = ObjectRelatedField(required=False, queryset=Asset.objects, label=_('Asset'), attrs=('id', 'name', 'ip'))
ip = serializers.ReadOnlyField(label=_("IP"))
asset_name = serializers.ReadOnlyField(label=_("Asset"))
platform = serializers.ReadOnlyField(label=_("Platform")) platform = serializers.ReadOnlyField(label=_("Platform"))
class Meta(AccountFieldsSerializerMixin.Meta): class Meta(AccountFieldsSerializerMixin.Meta):

4
apps/assets/serializers/account/common.py
View File

@ -8,8 +8,8 @@ __all__ = ['AccountFieldsSerializerMixin']
class AccountFieldsSerializerMixin(serializers.ModelSerializer): class AccountFieldsSerializerMixin(serializers.ModelSerializer):
class Meta: class Meta:
fields_mini = [ fields_mini = [
'id', 'name', 'username', 'privileged', 'ip', 'id', 'name', 'username', 'privileged',
'asset_name', 'platform', 'version' 'platform', 'version'
] ]
fields_write_only = ['password', 'private_key', 'public_key', 'passphrase'] fields_write_only = ['password', 'private_key', 'public_key', 'passphrase']
fields_other = ['date_created', 'date_updated', 'comment'] fields_other = ['date_created', 'date_updated', 'comment']