From fcd684e2dbbde23038de5b9e99b7b38915b4a03b Mon Sep 17 00:00:00 2001 From: Bai Date: Tue, 7 Jul 2020 11:09:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(assets):=20=E8=B5=84=E4=BA=A7=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E7=B1=BB=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E5=90=8D?= =?UTF-8?q?=20=5Fname=20=E4=B8=BA=20=5Fdisplay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/asset.py | 4 ---- apps/assets/serializers/asset.py | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/assets/models/asset.py b/apps/assets/models/asset.py index 20c040f74..6b5e716e0 100644 --- a/apps/assets/models/asset.py +++ b/apps/assets/models/asset.py @@ -244,10 +244,6 @@ class Asset(ProtocolsMixin, NodesRelationMixin, OrgModelMixin): def platform_base(self): return self.platform.base - @lazyproperty - def admin_user_display(self): - return self.admin_user.name - @lazyproperty def admin_user_username(self): """求可连接性时，直接用用户名去取，避免再查一次admin user diff --git a/apps/assets/serializers/asset.py b/apps/assets/serializers/asset.py index e36f41946..4100c439b 100644 --- a/apps/assets/serializers/asset.py +++ b/apps/assets/serializers/asset.py @@ -67,6 +67,9 @@ class AssetSerializer(BulkOrgResourceModelSerializer): slug_field='name', queryset=Platform.objects.all(), label=_("Platform") ) protocols = ProtocolsField(label=_('Protocols'), required=False) + domain_display = serializers.ReadOnlyField(source='domain.name') + admin_user_display = serializers.ReadOnlyField(source='admin_user.name') + """ 资产的数据结构 """ @@ -82,7 +85,7 @@ class AssetSerializer(BulkOrgResourceModelSerializer): 'created_by', 'date_created', 'hardware_info', ] fields_fk = [ - 'admin_user', 'admin_user_display', 'domain', 'platform' + 'admin_user', 'admin_user_display', 'domain', 'domain_display', 'platform' ] fk_only_fields = { 'platform': ['name']