From 373c6c77e09e3f224f47e946cc1f916fd7b929d5 Mon Sep 17 00:00:00 2001
From: xinwen <coderWen@126.com>
Date: Tue, 13 Oct 2020 15:50:11 +0800
Subject: [PATCH] =?UTF-8?q?fix(perms):=20=E6=9C=AA=E6=BF=80=E6=B4=BB?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7=E4=B8=8D=E8=83=BD=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/api/mixin.py                  | 1 +
 apps/perms/serializers/user_permission.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/assets/api/mixin.py b/apps/assets/api/mixin.py
index 89555324b..4374f399a 100644
--- a/apps/assets/api/mixin.py
+++ b/apps/assets/api/mixin.py
@@ -60,6 +60,7 @@ class SerializeToTreeNodeMixin:
                 'isParent': False,
                 'open': False,
                 'iconSkin': self.get_platform(asset),
+                'chkDisabled': not asset.is_active,
                 'meta': {
                     'type': 'asset',
                     'asset': {
diff --git a/apps/perms/serializers/user_permission.py b/apps/perms/serializers/user_permission.py
index 40334786f..bfc273775 100644
--- a/apps/perms/serializers/user_permission.py
+++ b/apps/perms/serializers/user_permission.py
@@ -75,7 +75,7 @@ class AssetGrantedSerializer(serializers.ModelSerializer):
         model = Asset
         only_fields = [
             "id", "hostname", "ip", "protocols", "os", 'domain',
-            "platform", "comment", "org_id",
+            "platform", "comment", "org_id", "is_active"
         ]
         fields = only_fields + ['org_name']
         read_only_fields = fields