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']