github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-25 14:50:24 +00:00
Code Issues Projects Releases Wiki Activity

perf: 修改 asset 结构

Browse Source
This commit is contained in:
ibuler
2022-09-21 11:17:14 +08:00
parent cf5c50b343
commit 1b0195cb82
37 changed files with 95 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/perms/api/asset_permission_relation.py
View File

@@ -88,7 +88,7 @@ class AssetPermissionAssetRelationViewSet(RelationMixin):
class AssetPermissionAllAssetListApi(generics.ListAPIView):
serializer_class = serializers.AssetPermissionAllAssetSerializer
filterset_fields = ("name", "ip")
filterset_fields = ("name", "address")
search_fields = filterset_fields
def get_queryset(self):

8
apps/perms/api/user_group_permission.py
View File

@@ -33,8 +33,8 @@ class UserGroupMixin:
class UserGroupGrantedAssetsApi(ListAPIView):
serializer_class = serializers.AssetGrantedSerializer
only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
filterset_fields = ['name', 'ip', 'id', 'comment']
search_fields = ['name', 'ip', 'comment']
filterset_fields = ['name', 'address', 'id', 'comment']
search_fields = ['name', 'address', 'comment']
rbac_perms = {
'list': 'perms.view_usergroupassets',
}
@@ -70,8 +70,8 @@ class UserGroupGrantedAssetsApi(ListAPIView):
class UserGroupGrantedNodeAssetsApi(ListAPIView):
serializer_class = serializers.AssetGrantedSerializer
only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
filterset_fields = ['name', 'ip', 'id', 'comment']
search_fields = ['name', 'ip', 'comment']
filterset_fields = ['name', 'address', 'id', 'comment']
search_fields = ['name', 'address', 'comment']
rbac_perms = {
'list': 'perms.view_usergroupassets',
}

10
apps/perms/api/user_permission/assets/mixin.py
View File

@@ -32,7 +32,7 @@ class UserDirectGrantedAssetsQuerysetMixin:
class UserAllGrantedAssetsQuerysetMixin:
only_fields = serializers.AssetGrantedSerializer.Meta.only_fields
pagination_class = AllGrantedAssetPagination
ordering_fields = ("hostname", "ip", "port", "cpu_cores")
ordering_fields = ("hostname", "address", "port", "cpu_cores")
ordering = ('hostname', )
user: User
@@ -84,8 +84,8 @@ class UserGrantedNodeAssetsMixin:
class AssetsSerializerFormatMixin:
serializer_class = serializers.AssetGrantedSerializer
filterset_fields = ['name', 'ip', 'id', 'comment']
search_fields = ['name', 'ip', 'comment']
filterset_fields = ['name', 'address', 'id', 'comment']
search_fields = ['name', 'address', 'comment']
class AssetsTreeFormatMixin(SerializeToTreeNodeMixin):
@@ -95,8 +95,8 @@ class AssetsTreeFormatMixin(SerializeToTreeNodeMixin):
filter_queryset: callable
get_queryset: callable
filterset_fields = ['name', 'ip', 'id', 'comment']
search_fields = ['name', 'ip', 'comment']
filterset_fields = ['name', 'address', 'id', 'comment']
search_fields = ['name', 'address', 'comment']
def list(self, request: Request, *args, **kwargs):
queryset = self.filter_queryset(self.get_queryset())