From 142348b05527b97dbe45233bff8166bba621f925 Mon Sep 17 00:00:00 2001
From: Eric <xplzv@126.com>
Date: Wed, 30 Nov 2022 17:52:00 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=A2=9E=E5=8A=A0=E8=B5=84=E4=BA=A7?=
=?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apps/perms/api/user_permission/assets/mixin.py | 3 +++
apps/perms/serializers/user_permission.py | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/apps/perms/api/user_permission/assets/mixin.py b/apps/perms/api/user_permission/assets/mixin.py
index e95ba7aa1..09abdf686 100644
--- a/apps/perms/api/user_permission/assets/mixin.py
+++ b/apps/perms/api/user_permission/assets/mixin.py
@@ -88,6 +88,9 @@ class AssetsSerializerFormatMixin:
serializer_class = serializers.AssetGrantedSerializer
filterset_fields = ['name', 'address', 'id', 'comment']
search_fields = ['name', 'address', 'comment']
+ filterset_class = AssetFilterSet
+ ordering_fields = ("name", "address")
+ ordering = ('name',)
class AssetsTreeFormatMixin(SerializeToTreeNodeMixin):
diff --git a/apps/perms/serializers/user_permission.py b/apps/perms/serializers/user_permission.py
index 3b60d25bb..9dcb04ae7 100644
--- a/apps/perms/serializers/user_permission.py
+++ b/apps/perms/serializers/user_permission.py
@@ -5,8 +5,8 @@ from django.utils.translation import ugettext_lazy as _
from rest_framework import serializers
from assets.const import Category, AllTypes
-from assets.serializers.asset.common import AssetProtocolsSerializer
from assets.models import Node, Asset, Platform, Account
+from assets.serializers.asset.common import AssetProtocolsSerializer
from common.drf.fields import ObjectRelatedField, LabeledChoiceField
from perms.serializers.permission import ActionChoicesField
@@ -48,5 +48,6 @@ class AccountsPermedSerializer(serializers.ModelSerializer):
class Meta:
model = Account
- fields = ['id', 'name', 'has_username', 'username', 'has_secret', 'secret_type', 'actions']
+ fields = ['id', 'name', 'has_username', 'username',
+ 'has_secret', 'secret_type', 'actions']
read_only_fields = fields