Merge pull request #713 from MITx/feature/arjun/discussion-fixes

Don't use the search API to retrieve all threads.

lms/djangoapps/django_comment_client/forum/views.py

@@ -28,26 +28,6 @@ PAGES_NEARBY_DELTA = 2
 escapedict = {'"': '"'}
 log = logging.getLogger("edx.discussions")
 
-def _general_discussion_id(course_id):
-    return course_id.replace('/', '_').replace('.', '_')
-
-def _should_perform_search(request):
-    return bool(request.GET.get('text', False) or \
-            request.GET.get('tags', False))
-
-def render_accordion(request, course, discussion_id):
-    # TODO: Delete if obsolete
-    discussion_info = utils.get_categorized_discussion_info(request, course)
-
-    context = {
-        'course': course,
-        'discussion_info': discussion_info,
-        'active': discussion_id,
-        'csrf': csrf(request)['csrf_token'],
-    }
-
-    return render_to_string('discussion/_accordion.html', context)
-
 def get_threads(request, course_id, discussion_id=None, per_page=THREADS_PER_PAGE):
     """
     This may raise cc.utils.CommentClientError or

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

@@ -244,7 +244,8 @@ if Backbone?
         item = $(event.target).closest('li')
         if item.find("span.board-name").data("discussion_id") == "#all"
           @discussionIds = ""
-          @clearSearch()
+          @$(".post-search-field").val("")
+          @retrieveAllThreads()
         else
           discussionIds = _.map item.find(".board-name[data-discussion_id]"), (board) -> $(board).data("discussion_id").id
           @retrieveDiscussions(discussionIds)
@@ -277,6 +278,18 @@ if Backbone?
           Content.loadContentInfos(response.content_info)
           @displayedCollection.reset(@collection.models)
 
+    retrieveAllThreads: () ->
+      url = DiscussionUtil.urlFor("threads")
+      DiscussionUtil.safeAjax
+        url: url
+        type: "GET"
+        success: (response, textStatus) =>
+          @collection.current_page = response.page
+          @collection.pages = response.num_pages
+          @collection.reset(response.discussion_data)
+          Content.loadContentInfos(response.content_info)
+          @displayedCollection.reset(@collection.models)
+
     sortThreads: (event) ->
       @$(".sort-bar a").removeClass("active")
       $(event.target).addClass("active")