Fixed pagingation issue.

see #2967
This commit is contained in:
Antoine Nguyen
2023-04-24 11:56:51 +02:00
parent cafb777d7f
commit eb60940d23
4 changed files with 8 additions and 4 deletions
+2 -1
View File
@@ -109,7 +109,8 @@ export default {
methods: {
fetchAlarms () {
const params = {
page: this.options.page
page: this.options.page,
page_size: this.options.itemsPerPage
}
if (this.options.sortBy) {
params.ordering = this.options.sortBy.map(item => this.options.sortDesc[0] ? `-${item}` : item).join(',')
+1 -1
View File
@@ -486,7 +486,7 @@ class AlarmViewSetTestCase(ModoAPITestCase):
url = reverse("v2:alarm-list")
resp = self.client.get(url)
self.assertEqual(resp.status_code, 200)
self.assertEqual(len(resp.json()), 1)
self.assertEqual(len(resp.json()["results"]), 1)
def test_update_alarm(self):
"""Try updating alarm status and delete it afterward."""
+3 -2
View File
@@ -7,13 +7,14 @@ from django.contrib.contenttypes.models import ContentType
from django_filters import rest_framework as dj_filters
from drf_spectacular.utils import extend_schema, extend_schema_view
from rest_framework import (
filters, mixins, parsers, pagination, permissions, response, status, viewsets
filters, mixins, parsers, permissions, response, status, viewsets
)
from rest_framework.decorators import action
from rest_framework.exceptions import PermissionDenied
from modoboa.admin.api.v1 import viewsets as v1_viewsets
from modoboa.core import models as core_models
from modoboa.lib import pagination
from modoboa.lib import renderers as lib_renderers
from modoboa.lib import viewsets as lib_viewsets
from modoboa.lib.throttle import GetThrottleViewsetMixin
@@ -351,7 +352,7 @@ class AlarmViewSet(GetThrottleViewsetMixin,
dj_filters.DjangoFilterBackend)
filterset_class = AlarmFilterSet
ordering_fields = ["created", "status", "title"]
pagination_class = pagination.PageNumberPagination
pagination_class = pagination.CustomPageNumberPagination
permission_classes = (
permissions.IsAuthenticated,
)
+2
View File
@@ -4,4 +4,6 @@ from rest_framework import pagination
class CustomPageNumberPagination(pagination.PageNumberPagination):
page_size = 50
page_size_query_param = "page_size"