Commit 3f58e1dd by Arjun Singh

Remove context from inline posts

parent 71089853
...@@ -71,6 +71,16 @@ def render_discussion(request, course_id, threads, *args, **kwargs): ...@@ -71,6 +71,16 @@ def render_discussion(request, course_id, threads, *args, **kwargs):
annotated_content_info = reduce(merge_dict, map(infogetter, threads), {}) annotated_content_info = reduce(merge_dict, map(infogetter, threads), {})
if discussion_type != 'inline':
course = get_course_with_access(request.user, course_id, 'load')
for thread in threads:
courseware_context = get_courseware_context(thread, course)
if courseware_context:
thread['courseware_location'] = courseware_context['courseware_location']
thread['courseware_title'] = courseware_context['courseware_title']
context = { context = {
'threads': threads, 'threads': threads,
'discussion_id': discussion_id, 'discussion_id': discussion_id,
...@@ -99,8 +109,6 @@ def render_user_discussion(*args, **kwargs): ...@@ -99,8 +109,6 @@ def render_user_discussion(*args, **kwargs):
def get_threads(request, course_id, discussion_id=None): def get_threads(request, course_id, discussion_id=None):
course = get_course_with_access(request.user, course_id, 'load')
default_query_params = { default_query_params = {
'page': 1, 'page': 1,
'per_page': THREADS_PER_PAGE, 'per_page': THREADS_PER_PAGE,
...@@ -117,13 +125,6 @@ def get_threads(request, course_id, discussion_id=None): ...@@ -117,13 +125,6 @@ def get_threads(request, course_id, discussion_id=None):
threads, page, num_pages = cc.Thread.search(query_params) threads, page, num_pages = cc.Thread.search(query_params)
for thread in threads:
courseware_context = get_courseware_context(thread, course)
if courseware_context:
thread['courseware_location'] = courseware_context['courseware_location']
thread['courseware_title'] = courseware_context['courseware_title']
query_params['page'] = page query_params['page'] = page
query_params['num_pages'] = num_pages query_params['num_pages'] = num_pages
......
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