From 1e85805ea3503b32b2eb99b33d4dd41421012543 Mon Sep 17 00:00:00 2001 From: xinwen Date: Tue, 16 Mar 2021 15:34:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E8=B5=84=E4=BA=A7=E8=BF=87=E6=BB=A4=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/user_permission/user_permission_assets/mixin.py | 5 ++--- .../asset/user_permission/user_permission_assets/views.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/perms/api/asset/user_permission/user_permission_assets/mixin.py b/apps/perms/api/asset/user_permission/user_permission_assets/mixin.py index d7a5c23dc..2464787d6 100644 --- a/apps/perms/api/asset/user_permission/user_permission_assets/mixin.py +++ b/apps/perms/api/asset/user_permission/user_permission_assets/mixin.py @@ -89,6 +89,8 @@ class AssetsTreeFormatMixin(SerializeToTreeNodeMixin): """ 将 资产 序列化成树的结构返回 """ + filterset_fields = ['hostname', 'ip', 'id', 'comment'] + search_fields = ['hostname', 'ip', 'comment'] def list(self, request: Request, *args, **kwargs): queryset = self.filter_queryset(self.get_queryset()) @@ -99,6 +101,3 @@ class AssetsTreeFormatMixin(SerializeToTreeNodeMixin): queryset = queryset[:999] data = self.serialize_assets(queryset, None) return Response(data=data) - - # def get_serializer_class(self): - # return EmptySerializer diff --git a/apps/perms/api/asset/user_permission/user_permission_assets/views.py b/apps/perms/api/asset/user_permission/user_permission_assets/views.py index 05b09442a..8a9690e12 100644 --- a/apps/perms/api/asset/user_permission/user_permission_assets/views.py +++ b/apps/perms/api/asset/user_permission/user_permission_assets/views.py @@ -82,7 +82,7 @@ class MyAllAssetsAsTreeApi(UserAllGrantedAssetsQuerysetMixin, RoleUserMixin, AssetsTreeFormatMixin, ListAPIView): - search_fields = ['hostname', 'ip'] + pass class UserGrantedNodeAssetsForAdminApi(UserGrantedNodeAssetsMixin,