Rename discussion_data to threads.

lms/djangoapps/django_comment_client/forum/views.py

@@ -139,7 +139,7 @@ def forum_form_discussion(request, course_id):
 
     if request.is_ajax():
         return utils.JsonResponse({
-            'discussion_data': context['threads'], # TODO: Standardize on 'discussion_data' vs 'threads'
+            'threads': context['threads'],
             'annotated_content_info': context['annotated_content_info'],
             'num_pages': query_params['num_pages'],
             'page': query_params['page'],
@@ -218,7 +218,7 @@ def user_profile(request, course_id, user_id):
 
         if request.is_ajax():
             return utils.JsonResponse({
-                'discussion_data': context['threads'],
+                'threads': context['threads'],
                 'page': page,
                 'num_pages': num_pages,
                 'annotated_content_info': context['annotated_content_info'],
@@ -252,13 +252,7 @@ def followed_threads(request, course_id, user_id):
 
         threads, page, num_pages = profiled_user.subscribed_threads(query_params)
         context = threads_context(request.user, threads, course_id, page, num_pages)
-        #return utils.JsonResponse(extract(context, ['annotated_content_info', 'threads', 'page', 'num_pages']))
-        return utils.JsonResponse({
-            'annotated_content_info': context['annotated_content_info'],
-            'discussion_data': context['threads'],
-            'page': page,
-            'num_pages': num_pages,
-            })
+        return utils.JsonResponse(extract(context, ['annotated_content_info', 'threads', 'page', 'num_pages']))
 
     except (cc.utils.CommentClientError, cc.utils.CommentClientUnknownError) as err:
         raise Http404

lms/static/coffee/src/discussion/discussion.coffee

@@ -66,7 +66,7 @@ if Backbone?
         dataType: 'json'
         success: (response, textStatus) =>
           models = @models
-          new_threads = [new Thread(data) for data in response.discussion_data][0]
+          new_threads = [new Thread(data) for data in response.threads][0]
           new_collection = _.union(models, new_threads)
           Content.loadContentInfos(response.annotated_content_info)
           @reset new_collection

lms/static/coffee/src/discussion/discussion_module_view.coffee

@@ -72,8 +72,8 @@ if Backbone?
       allow_anonymous_to_peers = response.allow_anonymous_to_peers
       # $elem.html("Hide Discussion")
       @discussion = new Discussion()
-      @discussion.reset(response.discussion_data, {silent: false})
-      $discussion = $(Mustache.render $("script#_inline_discussion").html(), {'threads':response.discussion_data, 'discussionId': discussionId, 'allow_anonymous_to_peers': allow_anonymous_to_peers, 'allow_anonymous': allow_anonymous})
+      @discussion.reset(response.threads, {silent: false})
+      $discussion = $(Mustache.render $("script#_inline_discussion").html(), {'threads':response.threads, 'discussionId': discussionId, 'allow_anonymous_to_peers': allow_anonymous_to_peers, 'allow_anonymous': allow_anonymous})
       if @$('section.discussion').length
         @$('section.discussion').replaceWith($discussion)
       else

lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee

@@ -274,7 +274,7 @@ if Backbone?
         success: (response, textStatus) =>
           @collection.current_page = response.page
           @collection.pages = response.num_pages
-          @collection.reset(response.discussion_data)
+          @collection.reset(response.threads)
           Content.loadContentInfos(response.annotated_content_info)
           @displayedCollection.reset(@collection.models)# Don't think this is necessary because it's called on collection.reset
           if callback?
@@ -337,7 +337,7 @@ if Backbone?
         success: (response, textStatus) =>
           if textStatus == 'success'
             # TODO: Augment existing collection?
-            @collection.reset(response.discussion_data)
+            @collection.reset(response.threads)
             Content.loadContentInfos(response.annotated_content_info)
             @collection.current_page = response.page
             @collection.pages = response.num_pages