github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-23 04:20:27 +00:00
Code Issues Projects Releases Wiki Activity

fix: The number of exported data is incorrect (#16043)

Browse Source 
Co-authored-by: wangruidong <940853815@qq.com>
This commit is contained in:
fit2bot
2025-09-16 18:52:24 +08:00
committed by GitHub
parent 2155bc6862
commit e025073da2
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/common/api/mixin.py
View File

@@ -8,7 +8,6 @@ from typing import Callable
from django.conf import settings from django.conf import settings
from django.db import models from django.db import models
from django.db.models.signals import m2m_changed from django.db.models.signals import m2m_changed
from common.utils import is_uuid
from rest_framework.request import Request from rest_framework.request import Request
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
@@ -18,6 +17,7 @@ from common.drf.filters import (
IDNotFilterBackend, NotOrRelFilterBackend, LabelFilterBackend IDNotFilterBackend, NotOrRelFilterBackend, LabelFilterBackend
) )
from common.utils import get_logger, lazyproperty from common.utils import get_logger, lazyproperty
from common.utils import is_uuid
from orgs.utils import tmp_to_org, tmp_to_root_org from orgs.utils import tmp_to_org, tmp_to_root_org
from .action import RenderToJsonMixin from .action import RenderToJsonMixin
from .serializer import SerializerMixin from .serializer import SerializerMixin
@@ -104,8 +104,10 @@ class QuerySetMixin:
if not pk or is_uuid(pk) or pk.isdigit(): if not pk or is_uuid(pk) or pk.isdigit():
return super().get_object() return super().get_object()
return self.get_queryset().get(**{self.slug_field: pk}) return self.get_queryset().get(**{self.slug_field: pk})
def limit_queryset_if_no_page(self, queryset): def limit_queryset_if_no_page(self, queryset):
if self.request.query_params.get('format') in ['csv', 'xlsx']:
return queryset
action = getattr(self, 'action', None) action = getattr(self, 'action', None)
if action != 'list': if action != 'list':
return queryset return queryset

5
apps/jumpserver/rewriting/pagination.py
View File

@@ -13,14 +13,9 @@ class MaxLimitOffsetPagination(LimitOffsetPagination):
return len(queryset) return len(queryset)
def paginate_queryset(self, queryset, request, view=None): def paginate_queryset(self, queryset, request, view=None):
if request.query_params.get('format') in ['csv', 'xlsx']:
self.default_limit = settings.MAX_LIMIT_PER_PAGE
return super().paginate_queryset(queryset, request, view)
if view and hasattr(view, 'page_max_limit'): if view and hasattr(view, 'page_max_limit'):
self.max_limit = view.page_max_limit self.max_limit = view.page_max_limit
if view and hasattr(view, 'page_default_limit'): if view and hasattr(view, 'page_default_limit'):
self.default_limit = view.page_default_limit self.default_limit = view.page_default_limit
return super().paginate_queryset(queryset, request, view) return super().paginate_queryset(queryset, request, view)