From cc387bf5116983d7efc9998714caa9aea223e274 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Wed, 24 Oct 2018 14:55:04 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5=EF=BC=8C?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/users/api/user.py | 5 ++++- apps/users/templates/users/user_list.html | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/users/api/user.py b/apps/users/api/user.py index ba0113a36..6bc0d4622 100644 --- a/apps/users/api/user.py +++ b/apps/users/api/user.py @@ -9,6 +9,7 @@ from rest_framework import generics from rest_framework.response import Response from rest_framework.permissions import IsAuthenticated from rest_framework_bulk import BulkModelViewSet +from rest_framework.pagination import LimitOffsetPagination from ..serializers import UserSerializer, UserPKUpdateSerializer, \ UserUpdateGroupSerializer, ChangeUserPasswordSerializer @@ -28,10 +29,12 @@ __all__ = [ class UserViewSet(IDInFilterMixin, BulkModelViewSet): + filter_fields = ('username', 'email', 'name', 'id') + search_fields = filter_fields queryset = User.objects.exclude(role="App") serializer_class = UserSerializer permission_classes = (IsOrgAdmin,) - filter_fields = ('username', 'email', 'name', 'id') + pagination_class = LimitOffsetPagination def get_queryset(self): queryset = super().get_queryset() diff --git a/apps/users/templates/users/user_list.html b/apps/users/templates/users/user_list.html index 4caf6e7a4..5b4565b8e 100644 --- a/apps/users/templates/users/user_list.html +++ b/apps/users/templates/users/user_list.html @@ -95,7 +95,7 @@ function initTable() { ], op_html: $('#actions').html() }; - table = jumpserver.initDataTable(options); + var table = jumpserver.initServerSideDataTable(options); return table }