From 2a9613d90a1eed28eb690e470d24b83321f7a951 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 28 Sep 2022 12:10:39 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20asset=20serializer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/serializers/asset/common.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/assets/serializers/asset/common.py b/apps/assets/serializers/asset/common.py index 419beba2b..56dea63d5 100644 --- a/apps/assets/serializers/asset/common.py +++ b/apps/assets/serializers/asset/common.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # -from io import StringIO from rest_framework import serializers from django.utils.translation import ugettext_lazy as _ @@ -9,7 +8,6 @@ from django.db.models import F from common.drf.serializers import JMSWritableNestedModelSerializer from common.drf.fields import LabeledChoiceField, ObjectRelatedField -from common.utils import validate_ssh_private_key, ssh_private_key_gen from ..account import AccountSerializer from ...models import Asset, Node, Platform, Label, Domain, Account, Protocol from ...const import Category, AllTypes @@ -29,7 +27,7 @@ class AssetProtocolsSerializer(serializers.ModelSerializer): class AssetLabelSerializer(serializers.ModelSerializer): class Meta: model = Label - fields = ['name', 'value'] + fields = ['id', 'name', 'value'] extra_kwargs = { 'name': {'required': False}, 'value': {'required': False} @@ -62,7 +60,7 @@ class AssetAccountSerializer(AccountSerializer): class AssetSerializer(JMSWritableNestedModelSerializer): category = LabeledChoiceField(choices=Category.choices, read_only=True, label=_('Category')) type = LabeledChoiceField(choices=AllTypes.choices(), read_only=True, label=_('Type')) - domain = ObjectRelatedField(required=False, queryset=Domain.objects, label=_('Domain')) + domain = ObjectRelatedField(required=False, queryset=Domain.objects, label=_('Domain'), allow_null=True) platform = ObjectRelatedField(required=False, queryset=Platform.objects, label=_('Platform')) nodes = ObjectRelatedField(many=True, required=False, queryset=Node.objects, label=_('Nodes')) labels = AssetLabelSerializer(many=True, required=False, label=_('Labels'))