Merge pull request #692 from MITx/feature/dave/new-discussions

Small fixes

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

@@ -17,10 +17,9 @@ if Backbone?
 
     render: ->
       @template = DiscussionUtil.getTemplate("_profile_thread")
-
       if not @model.has('abbreviatedBody')
         @abbreviateBody()
-      params = $.extend(@model.toJSON(),{expanded: @expanded})
+      params = $.extend(@model.toJSON(),{expanded: @expanded, permalink: @model.urlFor('retrieve')})
       if not @model.get('anonymous')
         params = $.extend(params, user:{username: @model.username, user_url: @model.user_url})
       @$el.html(Mustache.render(@template, params))

lms/templates/discussion/_user_profile.html

@@ -5,7 +5,7 @@
 
 <div class="user-profile">
   <%
-    role_names = sorted(map(attrgetter('name'), django_user.roles.all()))
+    role_names = sorted(set(map(attrgetter('name'), django_user.roles.all())))
   %>
   <div class="sidebar-username">${django_user.username | h}</div>
   <div class="sidebar-user-roles">

lms/templates/discussion/mustache/_profile_thread.mustache

@@ -25,8 +25,8 @@
     </ol>
 
     <div class="local post-tools">
-        <a href="javascript:void(0)" class="expand-post">View discussion</a>
-        <a href="javascript:void(0)" class="collapse-post">Hide discussion</a>
+        <a href="{{permalink}}">View discussion</a>
+        <!-- <a href="javascript:void(0)" class="collapse-post">Hide discussion</a> -->
     </div>
 
 </article>