mirror of https://github.com/jumpserver/jumpserver
fix: 用户授权资产过滤失效
parent
049f6dca67
commit
1e85805ea3
|
@ -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):
|
def list(self, request: Request, *args, **kwargs):
|
||||||
queryset = self.filter_queryset(self.get_queryset())
|
queryset = self.filter_queryset(self.get_queryset())
|
||||||
|
@ -99,6 +101,3 @@ class AssetsTreeFormatMixin(SerializeToTreeNodeMixin):
|
||||||
queryset = queryset[:999]
|
queryset = queryset[:999]
|
||||||
data = self.serialize_assets(queryset, None)
|
data = self.serialize_assets(queryset, None)
|
||||||
return Response(data=data)
|
return Response(data=data)
|
||||||
|
|
||||||
# def get_serializer_class(self):
|
|
||||||
# return EmptySerializer
|
|
||||||
|
|
|
@ -82,7 +82,7 @@ class MyAllAssetsAsTreeApi(UserAllGrantedAssetsQuerysetMixin,
|
||||||
RoleUserMixin,
|
RoleUserMixin,
|
||||||
AssetsTreeFormatMixin,
|
AssetsTreeFormatMixin,
|
||||||
ListAPIView):
|
ListAPIView):
|
||||||
search_fields = ['hostname', 'ip']
|
pass
|
||||||
|
|
||||||
|
|
||||||
class UserGrantedNodeAssetsForAdminApi(UserGrantedNodeAssetsMixin,
|
class UserGrantedNodeAssetsForAdminApi(UserGrantedNodeAssetsMixin,
|
||||||
|
|
Loading…
Reference in New Issue