devices by psp organizations - fix pages pagination
This commit is contained in:
@@ -41,8 +41,10 @@ class PageViewSet(viewsets.ModelViewSet):
|
|||||||
def list(self, request, *args, **kwargs):
|
def list(self, request, *args, **kwargs):
|
||||||
""" all pages """
|
""" all pages """
|
||||||
|
|
||||||
serializer = self.serializer_class(self.queryset.order_by('-create_date'), many=True)
|
page = self.paginate_queryset(self.queryset.order_by('-create_date'))
|
||||||
return Response(serializer.data, status=status.HTTP_200_OK)
|
if page is not None:
|
||||||
|
serializer = self.get_serializer(page, many=True)
|
||||||
|
return self.get_paginated_response(serializer.data)
|
||||||
|
|
||||||
@action(
|
@action(
|
||||||
methods=['delete'],
|
methods=['delete'],
|
||||||
|
|||||||
@@ -130,6 +130,25 @@ class DeviceViewSet(viewsets.ModelViewSet, AdminFilterMixin):
|
|||||||
serializer = OrganizationSerializer(page, many=True)
|
serializer = OrganizationSerializer(page, many=True)
|
||||||
return self.get_paginated_response(serializer.data)
|
return self.get_paginated_response(serializer.data)
|
||||||
|
|
||||||
|
@action(
|
||||||
|
methods=['get'],
|
||||||
|
detail=True,
|
||||||
|
url_path='devices_by_psp',
|
||||||
|
url_name='devices_by_psp',
|
||||||
|
name='devices_by_psp',
|
||||||
|
)
|
||||||
|
@transaction.atomic
|
||||||
|
def devices_by_psp(self, request, pk=None):
|
||||||
|
""" list of devices by their psp """
|
||||||
|
|
||||||
|
devices = self.queryset.filter(organization__id=pk).order_by('-create_date')
|
||||||
|
|
||||||
|
# paginate devices
|
||||||
|
page = self.paginate_queryset(devices)
|
||||||
|
if page is not None:
|
||||||
|
serializer = OrganizationSerializer(page, many=True)
|
||||||
|
return self.get_paginated_response(serializer.data)
|
||||||
|
|
||||||
|
|
||||||
class DeviceVersionViewSet(viewsets.ModelViewSet):
|
class DeviceVersionViewSet(viewsets.ModelViewSet):
|
||||||
queryset = pos_models.DeviceVersion.objects.all()
|
queryset = pos_models.DeviceVersion.objects.all()
|
||||||
|
|||||||
Reference in New Issue
Block a user