From 56862a965daeea689ae357fcfbdc3c9f3ed5a885 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Sat, 7 May 2022 10:40:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dsystem-role=E8=8E=B7?= =?UTF-8?q?=E5=8F=96users=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98=20(?= =?UTF-8?q?#8196)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jiangjie.Bai --- apps/rbac/api/role.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/rbac/api/role.py b/apps/rbac/api/role.py index f077964a6..f398f0315 100644 --- a/apps/rbac/api/role.py +++ b/apps/rbac/api/role.py @@ -8,6 +8,7 @@ from ..filters import RoleFilter from ..serializers import RoleSerializer, RoleUserSerializer from ..models import Role, SystemRole, OrgRole from .permission import PermissionViewSet +from common.mixins.api import PaginatedResponseMixin __all__ = [ 'RoleViewSet', 'SystemRoleViewSet', 'OrgRoleViewSet', @@ -15,7 +16,7 @@ __all__ = [ ] -class RoleViewSet(JMSModelViewSet): +class RoleViewSet(PaginatedResponseMixin, JMSModelViewSet): queryset = Role.objects.all() serializer_classes = { 'default': RoleSerializer, @@ -54,7 +55,7 @@ class RoleViewSet(JMSModelViewSet): def users(self, *args, **kwargs): role = self.get_object() queryset = role.users - return self.get_paginated_response_with_query_set(queryset) + return self.get_paginated_response_from_queryset(queryset) class SystemRoleViewSet(RoleViewSet):