haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 02:48:51 +00:00
Code Issues Releases Wiki Activity

remove total_count and links from activities api

Browse Source
This commit is contained in:
Hu
2018-07-11 16:19:27 +08:00
parent cf8cbff719
commit 08db8cc957
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
seahub/api2/endpoints/activities.py
View File

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

6
seahub/utils/__init__.py
View File

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