From da772b572a0504cc4c71b63eb6c7ca9af2e86d78 Mon Sep 17 00:00:00 2001 From: "Jiangjie.Bai" Date: Thu, 8 Sep 2022 20:31:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=88=E6=9D=83=20API=20=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/api/asset_permission_relation.py | 12 ++++-------- apps/perms/api/user_permission/assets/mixin.py | 8 ++++---- apps/perms/urls/asset_permission.py | 3 +++ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/apps/perms/api/asset_permission_relation.py b/apps/perms/api/asset_permission_relation.py index 41a6f083f..a3b65f3f3 100644 --- a/apps/perms/api/asset_permission_relation.py +++ b/apps/perms/api/asset_permission_relation.py @@ -40,8 +40,7 @@ class AssetPermissionUserRelationViewSet(RelationMixin): def get_queryset(self): queryset = super().get_queryset() - queryset = queryset \ - .annotate(user_display=F('user__name')) + queryset = queryset.annotate(user_display=F('user__name')) return queryset @@ -69,8 +68,7 @@ class AssetPermissionUserGroupRelationViewSet(RelationMixin): def get_queryset(self): queryset = super().get_queryset() - queryset = queryset \ - .annotate(usergroup_display=F('usergroup__name')) + queryset = queryset.annotate(usergroup_display=F('usergroup__name')) return queryset @@ -84,8 +82,7 @@ class AssetPermissionAssetRelationViewSet(RelationMixin): def get_queryset(self): queryset = super().get_queryset() - queryset = queryset \ - .annotate(asset_display=F('asset__name')) + queryset = queryset.annotate(asset_display=F('asset__name')) return queryset @@ -111,7 +108,6 @@ class AssetPermissionNodeRelationViewSet(RelationMixin): def get_queryset(self): queryset = super().get_queryset() - queryset = queryset \ - .annotate(node_key=F('node__key')) + queryset = queryset.annotate(node_key=F('node__key')) return queryset diff --git a/apps/perms/api/user_permission/assets/mixin.py b/apps/perms/api/user_permission/assets/mixin.py index 743881eba..096bd21b3 100644 --- a/apps/perms/api/user_permission/assets/mixin.py +++ b/apps/perms/api/user_permission/assets/mixin.py @@ -32,15 +32,15 @@ class UserDirectGrantedAssetsQuerysetMixin: class UserAllGrantedAssetsQuerysetMixin: only_fields = serializers.AssetGrantedSerializer.Meta.only_fields pagination_class = AllGrantedAssetPagination - user: User ordering_fields = ("hostname", "ip", "port", "cpu_cores") ordering = ('hostname', ) - + + user: User + def get_queryset(self): if getattr(self, 'swagger_fake_view', False): return Asset.objects.none() - queryset = UserGrantedAssetsQueryUtils(self.user) \ - .get_all_granted_assets() + queryset = UserGrantedAssetsQueryUtils(self.user).get_all_granted_assets() queryset = queryset.prefetch_related('platform').only(*self.only_fields) return queryset diff --git a/apps/perms/urls/asset_permission.py b/apps/perms/urls/asset_permission.py index a39f61a80..4258a2698 100644 --- a/apps/perms/urls/asset_permission.py +++ b/apps/perms/urls/asset_permission.py @@ -5,6 +5,7 @@ from rest_framework_bulk.routes import BulkRouter from .. import api +# v3 Done router = BulkRouter() router.register('asset-permissions', api.AssetPermissionViewSet, 'asset-permission') router.register('asset-permissions-users-relations', api.AssetPermissionUserRelationViewSet, 'asset-permissions-users-relation') @@ -86,6 +87,8 @@ user_group_permission_urlpatterns = [ ] permission_urlpatterns = [ + # Todo: 获取规则中授权的所有账号列表 + # # 授权规则中授权的资产 path('/assets/all/', api.AssetPermissionAllAssetListApi.as_view(), name='asset-permission-all-assets'), path('/users/all/', api.AssetPermissionAllUserListApi.as_view(), name='asset-permission-all-users'),