[Update] 修改使用Orgmodel view set

apps/applications/api/remote_app.py

@@ -3,8 +3,8 @@
 
 
 from rest_framework import generics
-from rest_framework_bulk import BulkModelViewSet
 
+from orgs.mixins import OrgBulkModelViewSet
 from ..hands import IsOrgAdmin, IsAppUser
 from ..models import RemoteApp
 from ..serializers import RemoteAppSerializer, RemoteAppConnectionInfoSerializer
@@ -15,7 +15,7 @@ __all__ = [
 ]
 
 
-class RemoteAppViewSet(BulkModelViewSet):
+class RemoteAppViewSet(OrgBulkModelViewSet):
     filter_fields = ('name',)
     search_fields = filter_fields
     permission_classes = (IsOrgAdmin,)

apps/assets/api/asset.py

@@ -91,7 +91,6 @@ class AssetViewSet(LabelFilter, OrgBulkModelViewSet):
         return queryset
 
 
-
 class AssetRefreshHardwareApi(generics.RetrieveAPIView):
     """
     Refresh asset hardware info

apps/assets/api/cmd_filter.py

 # -*- coding: utf-8 -*-
 #
 
-from rest_framework_bulk import BulkModelViewSet
 from django.shortcuts import get_object_or_404
 
+from orgs.mixins import OrgBulkModelViewSet
 from ..hands import IsOrgAdmin
 from ..models import CommandFilter, CommandFilterRule
 from .. import serializers
@@ -12,7 +12,7 @@ from .. import serializers
 __all__ = ['CommandFilterViewSet', 'CommandFilterRuleViewSet']
 
 
-class CommandFilterViewSet(BulkModelViewSet):
+class CommandFilterViewSet(OrgBulkModelViewSet):
     filter_fields = ("name",)
     search_fields = filter_fields
     permission_classes = (IsOrgAdmin,)
@@ -20,7 +20,7 @@ class CommandFilterViewSet(BulkModelViewSet):
     serializer_class = serializers.CommandFilterSerializer
 
 
-class CommandFilterRuleViewSet(BulkModelViewSet):
+class CommandFilterRuleViewSet(OrgBulkModelViewSet):
     filter_fields = ("content",)
     search_fields = filter_fields
     permission_classes = (IsOrgAdmin,)

apps/assets/api/domain.py

 # ~*~ coding: utf-8 ~*~
 
-from rest_framework_bulk import BulkModelViewSet
 from rest_framework.views import APIView, Response
 from django.views.generic.detail import SingleObjectMixin
 
 from common.utils import get_logger
 from common.permissions import IsOrgAdmin, IsOrgAdminOrAppUser
+from orgs.mixins import OrgBulkModelViewSet
 from ..models import Domain, Gateway
 from .. import serializers
 
@@ -14,7 +14,7 @@ logger = get_logger(__file__)
 __all__ = ['DomainViewSet', 'GatewayViewSet', "GatewayTestConnectionApi"]
 
 
-class DomainViewSet(BulkModelViewSet):
+class DomainViewSet(OrgBulkModelViewSet):
     queryset = Domain.objects.all()
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.DomainSerializer
@@ -34,7 +34,7 @@ class DomainViewSet(BulkModelViewSet):
         return super().get_permissions()
 
 
-class GatewayViewSet(BulkModelViewSet):
+class GatewayViewSet(OrgBulkModelViewSet):
     filter_fields = ("domain__name", "name", "username", "ip", "domain")
     search_fields = filter_fields
     queryset = Gateway.objects.all()

apps/jumpserver/settings.py

@@ -398,7 +398,7 @@ REST_FRAMEWORK = {
     'SEARCH_PARAM': "search",
     'DATETIME_FORMAT': '%Y-%m-%d %H:%M:%S %z',
     'DATETIME_INPUT_FORMATS': ['iso-8601', '%Y-%m-%d %H:%M:%S %z'],
-    # 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',
+    'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',
     # 'PAGE_SIZE': 15
 }
 

apps/users/api/group.py

@@ -2,7 +2,6 @@
 #
 
 from rest_framework import generics
-from rest_framework_bulk import BulkModelViewSet
 
 from ..serializers import (
     UserGroupSerializer,
@@ -10,14 +9,14 @@ from ..serializers import (
     UserGroupUpdateMemberSerializer,
 )
 from ..models import UserGroup
+from orgs.mixins import OrgBulkModelViewSet
 from common.permissions import IsOrgAdmin
-from common.mixins import IDInCacheFilterMixin
 
 
 __all__ = ['UserGroupViewSet', 'UserGroupUpdateUserApi']
 
 
-class UserGroupViewSet(IDInCacheFilterMixin, BulkModelViewSet):
+class UserGroupViewSet(OrgBulkModelViewSet):
     filter_fields = ("name",)
     search_fields = filter_fields
     queryset = UserGroup.objects.all()