From 08bc073fa5f808b594d4e1e9213d4043c2da375e Mon Sep 17 00:00:00 2001
From: Your Name <kevinchugh@edx.org>
Date: Wed, 13 Mar 2013 16:40:04 -0400
Subject: [PATCH] updates

---
 .../discussion/views/discussion_thread_list_view.coffee  | 2 +-
 lms/templates/discussion/_underscore_templates.html      | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
index b7518052a4..8364963218 100644
--- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
@@ -15,7 +15,7 @@ if Backbone?
     initialize: ->
       @displayedCollection = new Discussion(@collection.models, pages: @collection.pages)
       @collection.on "change", @reloadDisplayedCollection
-      @sortBy = "pinned"
+      @sortBy = "date"
       @discussionIds=""
       @collection.on "reset", (discussion) =>
         board = $(".current-board").html()
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index d6c0da5b4c..8a89ffe3ed 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -46,11 +46,14 @@
 
       <div class="post-body">${'<%- body %>'}</div>
       
-      % if has_permission(user, 'create_commentx', course.id):
+      % if has_permission(user, 'change_permission', course.id):
       <div class="admin-pin discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">                
       <i class="icon"></i><span class="pin-label">Pin Thread</span></div> 
-      elif pinned:
-        THIS ONE IS PINNED
+      %else:
+      ${"<% if (pinned) { %>"}
+      <div class="discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">                
+      <i class="icon"></i><span class="pin-label">Pin Thread</span></div> 
+      ${"<% }  %>"}  
       % endif