From c215278978fd63cee36874ed210389b5f698d276 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 18 Jul 2018 15:24:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E5=88=97=E8=A1=A8=E5=BC=95=E8=B5=B7=E7=9A=84=E5=88=86?= =?UTF-8?q?=E9=A1=B5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/api.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/apps/perms/api.py b/apps/perms/api.py index 090f1988a..88be52fe2 100644 --- a/apps/perms/api.py +++ b/apps/perms/api.py @@ -20,12 +20,9 @@ class AssetPermissionViewSet(viewsets.ModelViewSet): """ 资产授权列表的增删改查api """ - filter_fields = ("name",) - search_fields = filter_fields queryset = AssetPermission.objects.all() serializer_class = serializers.AssetPermissionCreateUpdateSerializer permission_classes = (IsSuperUser,) - pagination_class = LimitOffsetPagination def get_serializer_class(self): if self.action in ("list", 'retrieve'): From ce1fc0f3e29edca5d78c83a69e0825adb4e2f2be Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 18 Jul 2018 15:26:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E5=88=97=E8=A1=A8=E5=BC=95=E8=B5=B7=E7=9A=84=E5=88=86?= =?UTF-8?q?=E9=A1=B5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/templates/perms/asset_permission_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/perms/templates/perms/asset_permission_list.html b/apps/perms/templates/perms/asset_permission_list.html index 2f0f74312..c18f12224 100644 --- a/apps/perms/templates/perms/asset_permission_list.html +++ b/apps/perms/templates/perms/asset_permission_list.html @@ -208,7 +208,7 @@ function initTable() { select: {}, op_html: $('#actions').html() }; - table = jumpserver.initServerSideDataTable(options); + table = jumpserver.initDataTable(options); return table }