diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py index 2a4c419314..b7dd9cff79 100644 --- a/lms/djangoapps/django_comment_client/forum/views.py +++ b/lms/djangoapps/django_comment_client/forum/views.py @@ -121,6 +121,13 @@ def forum_form_discussion(request, course_id, discussion_id): content = render_forum_discussion(request, course_id, threads, discussion_id=discussion_id, \ query_params=query_params) + recent_active_threads = comment_client.search_recent_active_threads( + course_id, + recursive=False, + query_params={'follower_id': request.user.id, + 'commentable_id': discussion_id}, + ) + if request.is_ajax(): return utils.HtmlResponse(content) else: @@ -129,6 +136,7 @@ def forum_form_discussion(request, course_id, discussion_id): 'course': course, 'content': content, 'accordion': render_accordion(request, course, discussion_id), + 'recent_active_threads': recent_active_threads, } return render_to_response('discussion/index.html', context) diff --git a/lms/lib/comment_client.py b/lms/lib/comment_client.py index 46e70e512a..7e53042ea0 100644 --- a/lms/lib/comment_client.py +++ b/lms/lib/comment_client.py @@ -34,6 +34,11 @@ def search_similar_threads(course_id, recursive=False, query_params={}, *args, * attributes = dict(default_params.items() + query_params.items()) return _perform_request('get', _url_for_search_similar_threads(), attributes, *args, **kwargs) +def search_recent_active_threads(course_id, recursive=False, query_params={}, *args, **kwargs): + default_params = {'course_id': course_id, 'recursive': recursive} + attributes = dict(default_params.items() + query_params.items()) + return _perform_request('get', _url_for_search_recent_active_threads(), attributes, *args, **kwargs) + def create_user(attributes, *args, **kwargs): return _perform_request('post', _url_for_users(), attributes, *args, **kwargs) @@ -167,6 +172,9 @@ def _url_for_search_threads(): def _url_for_search_similar_threads(): return "{prefix}/search/threads/more_like_this".format(prefix=PREFIX) +def _url_for_search_recent_active_threads(): + return "{prefix}/search/threads/recent_active".format(prefix=PREFIX) + def _url_for_threads_tags(): return "{prefix}/threads/tags".format(prefix=PREFIX) diff --git a/lms/templates/discussion/_recent_active_posts.html b/lms/templates/discussion/_recent_active_posts.html index 3216d8f0bd..3492bcc0ae 100644 --- a/lms/templates/discussion/_recent_active_posts.html +++ b/lms/templates/discussion/_recent_active_posts.html @@ -1,10 +1,7 @@ Recent active posts that you are following
-Sapiente officiis debitis repellendus eligendi aliquid natus saepe. -Sapiente officiis debitis repellendus eligendi aliquid natus saepe. -Sapiente officiis debitis repellendus eligendi aliquid natus saepe. -Sapiente officiis debitis repellendus eligendi aliquid natus saepe. -Sapiente officiis debitis repellendus eligendi aliquid natus saepe. -Sapiente officiis debitis repellendus eligendi aliquid natus saepe. + % for thread in recent_active_threads: + ${thread['title']} + % endfor
diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html index e160617861..0a535c3492 100644 --- a/lms/templates/discussion/index.html +++ b/lms/templates/discussion/index.html @@ -27,6 +27,7 @@ <%include file="_recent_active_posts.html" /> + <%include file="_trending_tags.html" />