Remove X-total

onadata/apps/api/tests/viewsets/test_data_viewset.py

@@ -441,31 +441,23 @@ def test_data_pagination(self):
         request = self.factory.get('/', **self.extra)
         response = view(request, pk=formid)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(response.has_header('X-total'))
-        self.assertEqual(int(response.get('X-total')), 4)
         self.assertEqual(len(response.data), 4)
 
         request = self.factory.get('/', data={"page": "1", "page_size": 2},
                                    **self.extra)
         response = view(request, pk=formid)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(response.has_header('X-total'))
-        self.assertEqual(int(response.get('X-total')), 4)
         self.assertEqual(len(response.data), 2)
 
         request = self.factory.get('/', data={"page_size": "3"}, **self.extra)
         response = view(request, pk=formid)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(response.has_header('X-total'))
-        self.assertEqual(int(response.get('X-total')), 4)
         self.assertEqual(len(response.data), 3)
 
         request = self.factory.get(
             '/', data={"page": "1", "page_size": "2"}, **self.extra)
         response = view(request, pk=formid)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(response.has_header('X-total'))
-        self.assertEqual(int(response.get('X-total')), 4)
         self.assertEqual(len(response.data), 2)
 
         # invalid page returns a 404
@@ -722,17 +714,13 @@ def test_data_public(self):
         request = self.factory.get('/', **self.extra)
         response = view(request, pk='public')
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(response.has_header('X-total'))
-        self.assertEqual(int(response.get('X-total')), 0)
         self.assertEqual(response.data, [])
         self.xform.shared_data = True
         self.xform.save()
         formid = self.xform.pk
         data = _data_list(formid)
         response = view(request, pk='public')
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(response.has_header('X-total'))
-        self.assertEqual(int(response.get('X-total')), 1)
         self.assertEqual(response.data, data)
 
     def test_data_public_anon_user(self):
@@ -870,8 +858,6 @@ def test_data_with_query_parameter(self):
         request = self.factory.get('/?query=%s' % query_str, **self.extra)
         response = view(request, pk=formid)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(response.has_header('X-total'))
-        self.assertEqual(int(response.get('X-total')), 1)
         self.assertEqual(len(response.data), 1)
 
         submission_time = instance.date_created.strftime(MONGO_STRFTIME)

onadata/apps/api/viewsets/data_viewset.py

@@ -38,7 +38,6 @@
     AuthenticateHeaderMixin
 from onadata.libs.mixins.cache_control_mixin import CacheControlMixin
 from onadata.libs.mixins.etags_mixin import ETagsMixin
-from onadata.libs.mixins.total_header_mixin import TotalHeaderMixin
 from onadata.libs.pagination import StandardPageNumberPagination
 from onadata.libs.serializers.data_serializer import DataSerializer
 from onadata.libs.serializers.data_serializer import (
@@ -87,7 +86,6 @@ def delete_instance(instance):
 class DataViewSet(AnonymousUserPublicFormsMixin,
                   AuthenticateHeaderMixin,
                   ETagsMixin, CacheControlMixin,
-                  TotalHeaderMixin,
                   BaseViewset,
                   ModelViewSet):
     """

onadata/apps/api/viewsets/open_data_viewset.py

@@ -18,7 +18,6 @@
 from onadata.libs.data import parse_int
 from onadata.libs.mixins.cache_control_mixin import CacheControlMixin
 from onadata.libs.mixins.etags_mixin import ETagsMixin
-from onadata.libs.mixins.total_header_mixin import TotalHeaderMixin
 from onadata.libs.pagination import StandardPageNumberPagination
 from onadata.libs.serializers.data_serializer import DataInstanceSerializer
 from onadata.libs.serializers.open_data_serializer import OpenDataSerializer
@@ -33,7 +32,7 @@ def replace_special_characters_with_underscores(data):
     return [re.sub(r"\W", r"_", a) for a in data]
 
 
-class OpenDataViewSet(ETagsMixin, CacheControlMixin, TotalHeaderMixin,
+class OpenDataViewSet(ETagsMixin, CacheControlMixin,
                       BaseViewset, ModelViewSet):
     permission_classes = (OpenDataViewSetPermissions, )
     queryset = OpenData.objects.filter()

onadata/apps/main/views.py

@@ -532,7 +532,6 @@ def api(request, username=None, id_string=None):
         response_text = ("%s(%s)" % (callback, response_text))
 
     response = HttpResponse(response_text, content_type='application/json')
-    response['X-total'] = total_records
     add_cors_headers(response)
 
     return response

onadata/apps/viewer/static/js/data_view.js

@@ -31,7 +31,9 @@
             pageSize: "limit"
         },
         parseState: function (resp, queryParams, state, options) {
-            return {totalRecords: parseInt(options.xhr.getResponseHeader("X-total"))};
+            // Removing X-total
+            // {totalRecords: parseInt(options.xhr.getResponseHeader("X-total"))};
+            return 0;
         },
         initialize: function (models, options) {
             // set the url