Merge branch 'hotfix/LIL-686' into 'master'

Hotfix/lil 686

See merge request lilcity/backend!181

api/v1/views.py

@@ -92,14 +92,10 @@ class AuthorBalanceViewSet(ExtendedModelViewSet):
         'author__last_name',
     )
 
-    def get_queryset(self):
-        qs = super().get_queryset()
-        return qs
-
     def list(self, request, *args, **kwargs):
         queryset = self.filter_queryset(self.get_queryset())
 
-        if 'page' in request.query_params:
+        if request.query_params.get('page'):
             page = self.paginate_queryset(queryset)
             if page is not None:
                 serializer = self.get_serializer(page, many=True)
@@ -425,6 +421,18 @@ class UserViewSet(ExtendedModelViewSet):
     #     'delete': IsAdmin,
     # }
 
+    def list(self, request, *args, **kwargs):
+        queryset = self.filter_queryset(self.get_queryset())
+
+        if request.query_params.get('page'):
+            page = self.paginate_queryset(queryset)
+            if page is not None:
+                serializer = self.get_serializer(page, many=True)
+                return self.get_paginated_response(serializer.data)
+
+        serializer = self.get_serializer(queryset, many=True)
+        return Response(serializer.data)
+
     @list_route(methods=['get'])
     def me(self, request):
         serializer = self.get_serializer_class()