Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix pagination and sorting for followed threads. Also fixed sorting so that it always retrieves a new set of threads from the server for the initial set.

Browse Source
This commit is contained in:
Ibrahim Awwal
2012-09-18 04:35:32 -07:00
parent a444166d98
commit ef8ca23dee
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/djangoapps/django_comment_client/forum/views.py
View File

@@ -249,15 +249,19 @@ def user_profile(request, course_id, user_id):
threads, page, num_pages = profiled_user.active_threads(query_params)
query_params['page'] = page
query_params['num_pages'] = num_pages
user_info = cc.User.from_django_user(request.user).to_dict()
annotated_content_info = utils.get_metadata_for_threads(course_id, threads, request.user, user_info)
if request.is_ajax():
return utils.JsonResponse({
'discussion_data': map(utils.safe_content, threads),
'page': query_params['page'],
'num_pages': query_params['num_pages'],
'annotated_content_info': saxutils.escape(json.dumps(annotated_content_info),escapedict),
})
else:
user_info = cc.User.from_django_user(request.user).to_dict()
annotated_content_info = utils.get_metadata_for_threads(course_id, threads, request.user, user_info)
context = {
'course': course,
@@ -286,7 +290,7 @@ def following_threads(request, course_id, user_id):
'sort_key': 'date',#TODO: Allow custom sorting?
'sort_order': 'desc',
}
print user_id
threads, page, num_pages = profiled_user.subscribed_threads(query_params)
query_params['page'] = page
query_params['num_pages'] = num_pages
@@ -297,6 +301,8 @@ def following_threads(request, course_id, user_id):
return utils.JsonResponse({
'annotated_content_info': annotated_content_info,
'discussion_data': map(utils.safe_content, threads),
'page': query_params['page'],
'num_pages': query_params['num_pages'],
})
else: