From b2991362f1189ae0621ea68b55c83b3b65739710 Mon Sep 17 00:00:00 2001
From: feng626 <1304903146@qq.com>
Date: Thu, 29 Sep 2022 18:01:23 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=9F=A5=E7=9C=8B=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/acls/serializers/login_asset_acl.py       | 2 +-
 apps/assets/serializers/asset/common.py        | 1 -
 apps/perms/api/user_permission/assets/mixin.py | 7 ++++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/acls/serializers/login_asset_acl.py b/apps/acls/serializers/login_asset_acl.py
index 884b75c52..7282bf1a9 100644
--- a/apps/acls/serializers/login_asset_acl.py
+++ b/apps/acls/serializers/login_asset_acl.py
@@ -57,7 +57,7 @@ class LoginAssetACLAccountsSerializer(serializers.Serializer):
 class LoginAssetACLSerializer(BulkOrgResourceModelSerializer):
     users = LoginAssetACLUsersSerializer()
     assets = LoginAssetACLAssestsSerializer()
-    account = LoginAssetACLAccountsSerializer()
+    accounts = LoginAssetACLAccountsSerializer()
     reviewers_amount = serializers.IntegerField(read_only=True, source='reviewers.count')
     action_display = serializers.ReadOnlyField(source='get_action_display', label=_('Action'))
 
diff --git a/apps/assets/serializers/asset/common.py b/apps/assets/serializers/asset/common.py
index 56dea63d5..4aef50f58 100644
--- a/apps/assets/serializers/asset/common.py
+++ b/apps/assets/serializers/asset/common.py
@@ -108,7 +108,6 @@ class AssetSerializer(JMSWritableNestedModelSerializer):
         instance.nodes.set(nodes_to_set)
 
     def validate_nodes(self, nodes):
-        print("Nodes: ", nodes)
         if nodes:
             return nodes
         request = self.context.get('request')
diff --git a/apps/perms/api/user_permission/assets/mixin.py b/apps/perms/api/user_permission/assets/mixin.py
index ad50c5b19..d82e39faa 100644
--- a/apps/perms/api/user_permission/assets/mixin.py
+++ b/apps/perms/api/user_permission/assets/mixin.py
@@ -32,8 +32,8 @@ class UserDirectGrantedAssetsQuerysetMixin:
 class UserAllGrantedAssetsQuerysetMixin:
     only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
     pagination_class = AllGrantedAssetPagination
-    ordering_fields = ("hostname", "address", "port", "cpu_cores")
-    ordering = ('hostname', )
+    ordering_fields = ("name", "address", "port", "cpu_cores")
+    ordering = ('name', )
 
     user: User
 
@@ -41,7 +41,8 @@ class UserAllGrantedAssetsQuerysetMixin:
         if getattr(self, 'swagger_fake_view', False):
             return Asset.objects.none()
         queryset = UserGrantedAssetsQueryUtils(self.user).get_all_granted_assets()
-        queryset = queryset.prefetch_related('platform').only(*self.only_fields)
+        only_fields = [i for i in self.only_fields if i not in ['protocols']]
+        queryset = queryset.prefetch_related('platform', 'protocols').only(*only_fields)
         return queryset