From a43d6ad34df8fd6160b5874b4e046d0823a8b9e2 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 4 Jun 2020 20:26:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B5=84=E4=BA=A7=E6=B7=BB=E5=8A=A0adm?=
 =?UTF-8?q?in=5Fuser=5Fdisplay?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/api/asset.py         | 5 ++++-
 apps/assets/models/asset.py      | 4 ++++
 apps/assets/serializers/asset.py | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/assets/api/asset.py b/apps/assets/api/asset.py
index 15b9ec75f..b5356af16 100644
--- a/apps/assets/api/asset.py
+++ b/apps/assets/api/asset.py
@@ -33,7 +33,10 @@ class AssetViewSet(OrgBulkModelViewSet):
     API endpoint that allows Asset to be viewed or edited.
     """
     model = Asset
-    filter_fields = ("hostname", "ip", "systemuser__id", "admin_user__id", "platform__base")
+    filter_fields = (
+        "hostname", "ip", "systemuser__id", "admin_user__id", "platform__base",
+        "is_active"
+    )
     search_fields = ("hostname", "ip")
     ordering_fields = ("hostname", "ip", "port", "cpu_cores")
     serializer_classes = {
diff --git a/apps/assets/models/asset.py b/apps/assets/models/asset.py
index 6b5e716e0..20c040f74 100644
--- a/apps/assets/models/asset.py
+++ b/apps/assets/models/asset.py
@@ -244,6 +244,10 @@ 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 3f9a3eb84..e238c29a7 100644
--- a/apps/assets/serializers/asset.py
+++ b/apps/assets/serializers/asset.py
@@ -82,7 +82,7 @@ class AssetSerializer(BulkOrgResourceModelSerializer):
             'created_by', 'date_created', 'hardware_info',
         ]
         fields_fk = [
-            'admin_user', 'domain', 'platform'
+            'admin_user', 'admin_user_display', 'domain', 'platform'
         ]
         fk_only_fields = {
             'platform': ['name']