github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 修复system-role获取users失败的问题 (#8197) 

Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
pull/8200/head
fit2bot 2022-05-07 10:40:01 +08:00 committed by GitHub
parent 9bd9d443b4
commit a23bd4b3eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/rbac/api/role.py
View File

@ -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):