From d7e97629aa4e0b4139d71fae8310b4d354eadc1f Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 20 Oct 2020 14:15:29 +0800 Subject: [PATCH] =?UTF-8?q?fix(perms):=20=E4=BF=AE=E5=A4=8Dasset=20permiss?= =?UTF-8?q?ion=E5=AF=BC=E5=85=A5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/api/asset_permission.py | 4 ++-- apps/perms/serializers/asset_permission.py | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/perms/api/asset_permission.py b/apps/perms/api/asset_permission.py index 18061f236..7b795a5a5 100644 --- a/apps/perms/api/asset_permission.py +++ b/apps/perms/api/asset_permission.py @@ -3,7 +3,7 @@ from django.db.models import Q from common.permissions import IsOrgAdmin -from orgs.mixins.api import OrgModelViewSet +from orgs.mixins.api import OrgBulkModelViewSet from common.utils import get_object_or_none from ..models import AssetPermission from ..hands import ( @@ -17,7 +17,7 @@ __all__ = [ ] -class AssetPermissionViewSet(OrgModelViewSet): +class AssetPermissionViewSet(OrgBulkModelViewSet): """ 资产授权列表的增删改查api """ diff --git a/apps/perms/serializers/asset_permission.py b/apps/perms/serializers/asset_permission.py index 2c2cfd3ce..cfddfdd99 100644 --- a/apps/perms/serializers/asset_permission.py +++ b/apps/perms/serializers/asset_permission.py @@ -43,12 +43,14 @@ class AssetPermissionSerializer(BulkOrgResourceModelSerializer): model = AssetPermission mini_fields = ['id', 'name'] small_fields = mini_fields + [ - 'is_active', 'is_expired', 'is_valid', 'actions', 'created_by', 'date_created', - 'date_expired', 'date_start', 'comment' + 'is_active', 'is_expired', 'is_valid', 'actions', + 'created_by', 'date_created', 'date_expired', + 'date_start', 'comment' ] m2m_fields = [ 'users', 'user_groups', 'assets', 'nodes', 'system_users', - 'users_amount', 'user_groups_amount', 'assets_amount', 'nodes_amount', 'system_users_amount', + 'users_amount', 'user_groups_amount', 'assets_amount', + 'nodes_amount', 'system_users_amount', ] fields = small_fields + m2m_fields read_only_fields = ['created_by', 'date_created']