Commit 73592167 by Ibrahim Awwal

Slight cleanup.

parent a1286ef0
...@@ -77,7 +77,7 @@ def threads_context(user, threads, course_id, page, num_pages): ...@@ -77,7 +77,7 @@ def threads_context(user, threads, course_id, page, num_pages):
return { return {
'threads': [utils.safe_content(thread) for thread in threads], 'threads': [utils.safe_content(thread) for thread in threads],
'user_info': user_info, 'user_info': user_info, # TODO: This should not be returned on each JSON response
'annotated_content_info': annotated_content_info, 'annotated_content_info': annotated_content_info,
'page': page, 'page': page,
'num_pages': num_pages, 'num_pages': num_pages,
...@@ -209,12 +209,8 @@ def user_profile(request, course_id, user_id): ...@@ -209,12 +209,8 @@ def user_profile(request, course_id, user_id):
context = threads_context(request.user, threads, course_id, page, num_pages) context = threads_context(request.user, threads, course_id, page, num_pages)
if request.is_ajax(): if request.is_ajax():
return utils.JsonResponse({ del context['roles']
'threads': context['threads'], return utils.JsonResponse(context)
'page': page,
'num_pages': num_pages,
'annotated_content_info': context['annotated_content_info'],
})
else: else:
context.update({ context.update({
'course': course, 'course': course,
...@@ -242,7 +238,8 @@ def followed_threads(request, course_id, user_id): ...@@ -242,7 +238,8 @@ def followed_threads(request, course_id, user_id):
threads, page, num_pages = profiled_user.subscribed_threads(query_params) threads, page, num_pages = profiled_user.subscribed_threads(query_params)
context = threads_context(request.user, threads, course_id, page, num_pages) context = threads_context(request.user, threads, course_id, page, num_pages)
return utils.JsonResponse(extract(context, ['annotated_content_info', 'threads', 'page', 'num_pages'])) del context['roles']
return utils.JsonResponse(context)
except (cc.utils.CommentClientError, cc.utils.CommentClientUnknownError) as err: except (cc.utils.CommentClientError, cc.utils.CommentClientUnknownError) as err:
raise Http404 raise Http404
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment