mirror of https://github.com/jumpserver/jumpserver
[Update] 添加ids filter
parent
42c5c02709
commit
0d2b4d7ca3
|
@ -9,7 +9,7 @@ import logging
|
||||||
|
|
||||||
from common import const
|
from common import const
|
||||||
|
|
||||||
__all__ = ["DatetimeRangeFilter", "IDSpmFilter", "CustomFilter"]
|
__all__ = ["DatetimeRangeFilter", "IDSpmFilter", 'IDInFilter', "CustomFilter"]
|
||||||
|
|
||||||
|
|
||||||
class DatetimeRangeFilter(filters.BaseFilterBackend):
|
class DatetimeRangeFilter(filters.BaseFilterBackend):
|
||||||
|
@ -68,6 +68,25 @@ class IDSpmFilter(filters.BaseFilterBackend):
|
||||||
return queryset
|
return queryset
|
||||||
|
|
||||||
|
|
||||||
|
class IDInFilter(filters.BaseFilterBackend):
|
||||||
|
def get_schema_fields(self, view):
|
||||||
|
return [
|
||||||
|
coreapi.Field(
|
||||||
|
name='ids', location='query', required=False,
|
||||||
|
type='string', example='/api/v1/users/users?ids=1,2,3',
|
||||||
|
description='Filter by id set'
|
||||||
|
)
|
||||||
|
]
|
||||||
|
|
||||||
|
def filter_queryset(self, request, queryset, view):
|
||||||
|
ids = request.query_params.get('ids')
|
||||||
|
if not ids:
|
||||||
|
return queryset
|
||||||
|
id_list = [i.strip() for i in ids.split(',')]
|
||||||
|
queryset = queryset.filter(id__in=id_list)
|
||||||
|
return queryset
|
||||||
|
|
||||||
|
|
||||||
class CustomFilter(filters.BaseFilterBackend):
|
class CustomFilter(filters.BaseFilterBackend):
|
||||||
|
|
||||||
def get_schema_fields(self, view):
|
def get_schema_fields(self, view):
|
||||||
|
|
|
@ -9,7 +9,7 @@ from django.http import JsonResponse
|
||||||
from rest_framework.response import Response
|
from rest_framework.response import Response
|
||||||
from rest_framework.settings import api_settings
|
from rest_framework.settings import api_settings
|
||||||
|
|
||||||
from common.drf.filters import IDSpmFilter, CustomFilter
|
from common.drf.filters import IDSpmFilter, CustomFilter, IDInFilter
|
||||||
from ..utils import lazyproperty
|
from ..utils import lazyproperty
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
|
@ -49,7 +49,7 @@ class SerializerMixin:
|
||||||
|
|
||||||
|
|
||||||
class ExtraFilterFieldsMixin:
|
class ExtraFilterFieldsMixin:
|
||||||
default_added_filters = [CustomFilter, IDSpmFilter]
|
default_added_filters = [CustomFilter, IDSpmFilter, IDInFilter]
|
||||||
filter_backends = api_settings.DEFAULT_FILTER_BACKENDS
|
filter_backends = api_settings.DEFAULT_FILTER_BACKENDS
|
||||||
extra_filter_fields = []
|
extra_filter_fields = []
|
||||||
extra_filter_backends = []
|
extra_filter_backends = []
|
||||||
|
|
|
@ -34,7 +34,6 @@ class OrgMiddleware:
|
||||||
def __call__(self, request):
|
def __call__(self, request):
|
||||||
self.set_permed_org_if_need(request)
|
self.set_permed_org_if_need(request)
|
||||||
org = get_org_from_request(request)
|
org = get_org_from_request(request)
|
||||||
if org is not None:
|
|
||||||
request.current_org = org
|
request.current_org = org
|
||||||
set_current_org(org)
|
set_current_org(org)
|
||||||
response = self.get_response(request)
|
response = self.get_response(request)
|
||||||
|
|
|
@ -24,7 +24,7 @@ def get_org_from_request(request):
|
||||||
oid = Organization.DEFAULT_ID
|
oid = Organization.DEFAULT_ID
|
||||||
elif oid.lower() == "root":
|
elif oid.lower() == "root":
|
||||||
oid = Organization.ROOT_ID
|
oid = Organization.ROOT_ID
|
||||||
org = Organization.get_instance(oid)
|
org = Organization.get_instance(oid, True)
|
||||||
return org
|
return org
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue