From 3c32aff1233473766fed3a3af4ebb8185f8f5484 Mon Sep 17 00:00:00 2001
From: Rocky Duan <dementrock@gmail.com>
Date: Tue, 14 Aug 2012 12:50:22 -0700
Subject: [PATCH] disable asc sorting for now

---
 lms/static/coffee/src/discussion/discussion.coffee | 1 +
 lms/templates/discussion/_sort.html                | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lms/static/coffee/src/discussion/discussion.coffee b/lms/static/coffee/src/discussion/discussion.coffee
index 329cd19a7e..7d415e3161 100644
--- a/lms/static/coffee/src/discussion/discussion.coffee
+++ b/lms/static/coffee/src/discussion/discussion.coffee
@@ -126,6 +126,7 @@ initializeFollowDiscussion = (discussion) ->
       $local(".new-post-form").show()
 
     handleAjaxReloadDiscussion = (elem, url) ->
+      if not url then return
       $elem = $(elem)
       $discussion = $elem.parents("section.discussion")
       Discussion.safeAjax
diff --git a/lms/templates/discussion/_sort.html b/lms/templates/discussion/_sort.html
index e93ce29e3d..8045e3936e 100644
--- a/lms/templates/discussion/_sort.html
+++ b/lms/templates/discussion/_sort.html
@@ -2,11 +2,14 @@
 
 <%def name="link_to_sort(key, title)">
   % if key == sort_key:
+    ${_link_to_sort(key, None, title + '', 'sorted')}
+    <!---
     % if sort_order.lower() == 'desc':
       ${_link_to_sort(key, 'asc', title + '', 'sorted')}
     % else:
       ${_link_to_sort(key, 'desc', title + '', 'sorted')}
     % endif
+    -->
   % else:
     ${_link_to_sort(key, 'desc', title)}
   % endif
@@ -18,7 +21,10 @@
     return dict(dic1.items() + dic2.items())
 
   def url_for_sort(key, order):
-    return base_url + '?' + urlencode(merge(query_params, {'page': 1, 'sort_key': key, 'sort_order': order}))
+    if order is None:
+      return ''
+    else:
+      return base_url + '?' + urlencode(merge(query_params, {'page': 1, 'sort_key': key, 'sort_order': order}))
   %>
   <a class="discussion-sort-link ${cls}" href="javascript:void(0)" sort-url="${url_for_sort(key, order)}">${title}</a>
 </%def>