Commit fe16c353 authored by John Red Medrano's avatar John Red Medrano

Merge pull request #459 in RMS/api-main-service from red-develop to RMSv2

* commit '4561d14f':
  override list to aviod the error on batch upload
parents f1c332d6 4561d14f
...@@ -35,16 +35,31 @@ class BatchUploadViewSet(viewsets.ModelViewSet): ...@@ -35,16 +35,31 @@ class BatchUploadViewSet(viewsets.ModelViewSet):
pagination_class = CustomPagination pagination_class = CustomPagination
lookup_field = 'code' lookup_field = 'code'
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
queryset = self.filter_queryset(self.get_queryset()) queryset = self.filter_queryset(self.get_queryset())
page = self.paginate_queryset(queryset) page = self.paginate_queryset(queryset)
if page is not None: if page is not None:
serializer = self.get_serializer(page, many=True) serializer = self.get_serializer(page, many=True)
return self.get_paginated_response(serializer.data)
message = status_message_response(
200,
'success',
'list of Users found',
serializer.data
)
return self.get_paginated_response(message)
serializer = self.get_serializer(queryset, many=True) serializer = self.get_serializer(queryset, many=True)
return Response(serializer.data)
return Response(
serializer.data,
status=status.HTTP_200_OK
)
@action( @action(
detail=True, methods=['get'], detail=True, methods=['get'],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment