Merge branch 'hotfix/2.4.7' into develop

Author: chrisseto

api/pagination.py

@@ -1,13 +1,21 @@
+import logging
+
 from django.core.paginator import Paginator
 from django.utils.functional import cached_property
 
 from rest_framework_json_api.pagination import PageNumberPagination
 
 
+logger = logging.getLogger(__name__)
+
+
 class FuzzyPaginator(Paginator):
 
     @cached_property
     def count(self):
+        if not hasattr(self.object_list, 'fuzzy_count'):
+            logger.warning('%r has no fuzzy_count method. Falling back to a normal count', self.object_list)
+            return self.object_list.count()
         return self.object_list.fuzzy_count()
 
 

api/views/banner.py

@@ -1,5 +1,4 @@
 from rest_framework import viewsets
-from rest_framework_json_api.pagination import PageNumberPagination
 
 from api.serializers import SiteBannerSerializer
 from share.models import SiteBanner
@@ -8,7 +7,6 @@
 class SiteBannerViewSet(viewsets.ReadOnlyModelViewSet):
     """View showing all active site-wide announcements."""
     serializer_class = SiteBannerSerializer
-    pagination_class = PageNumberPagination
 
     def get_queryset(self):
         return SiteBanner.objects.filter(active=True)

tests/api/test_providerregistration.py

@@ -309,3 +309,23 @@ def test_post_data(self, trusted_user, client, _request, response, authorized):
     @pytest.mark.django_db
     def test_get_data(self, client):
         assert client.get('/api/v2/sourceregistrations/').status_code == 401
+
+    @pytest.mark.django_db
+    def test_get_data_authorized(self, trusted_user, client):
+        resp = client.get(
+            '/api/v2/sourceregistrations/',
+            content_type='application/vnd.api+json',
+            HTTP_AUTHORIZATION='Bearer {}'.format(trusted_user.accesstoken_set.first()),
+        )
+
+        assert resp.status_code == 200
+        assert resp.json() == {
+            'data': [],
+            'links': {
+                'prev': None,
+                'next': None,
+                'last': 'http://testserver/api/v2/sourceregistrations/?page=1',
+                'first': 'http://testserver/api/v2/sourceregistrations/?page=1',
+            },
+            'meta': {'pagination': {'count': 0, 'page': 1, 'pages': 1}}
+        }