remove total_count and links from activities api

seahub/api2/endpoints/activities.py

@@ -8,7 +8,6 @@ from rest_framework.views import APIView
 from rest_framework.response import Response
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.authentication import SessionAuthentication
-from django.core.urlresolvers import reverse
 
 from seahub.base.templatetags.seahub_tags import translate_seahub_time, \
         email2contact_email
@@ -18,7 +17,6 @@ from seahub.utils.timeutils import utc_to_local
 from seahub.api2.utils import api_error
 from seahub.api2.throttling import UserRateThrottle
 from seahub.api2.authentication import TokenAuthentication
-from seahub.api2.endpoints.utils import generate_links_header_for_paginator
 from seahub.base.templatetags.seahub_tags import email2nickname
 from seahub.avatar.templatetags.avatar_tags import api_avatar_url
 
@@ -48,12 +46,9 @@ class ActivitiesView(APIView):
 
         if is_org_context(request):
             org_id = request.user.org.org_id
-            events, total_count = get_org_user_activities(org_id, email,
-                                                                 start,
-                                                                 count)
+            events = get_org_user_activities(org_id, email, start, count)
         else:
-            events, total_count = get_user_activities(email, start,
-                                                             count)
+            events = get_user_activities(email, start, count)
 
         events_list = []
         for e in events:
@@ -90,13 +85,7 @@ class ActivitiesView(APIView):
             events_list.append(d)
 
         ret = {
-            'events': events_list,
-            'total_count': total_count
+            'events': events_list
             }
 
-        resp = Response(ret)
-        base_url = reverse('api-v2.1-acitvity')
-        links_header = generate_links_header_for_paginator(base_url, page,
-                                                           per_page, total_count)
-        resp['Links'] = links_header
-        return resp
+        return Response(ret)

seahub/utils/__init__.py

@@ -611,15 +611,15 @@ if EVENTS_CONFIG_FILE:
         events, total_count = [], 0
         try:
             if org_id > 0:
-                events, total_count = seafevents.get_org_user_activities(ev_session,
+                events = seafevents.get_org_user_activities(ev_session,
                         org_id, username, start, count)
             else:
-                events, total_count = seafevents.get_user_activities(ev_session,
+                events = seafevents.get_user_activities(ev_session,
                         username, start, count)
         finally:
             ev_session.close()
 
-        return events, total_count
+        return events
 
     def _get_events_inner(ev_session, username, start, limit, org_id=None):
         '''Read events from seafevents database, and remove events that are