From 820003b96cce1aa6871daf788b38b96c894098b0 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@edx.org>
Date: Fri, 14 Sep 2012 14:29:17 -0400
Subject: [PATCH 1/2] Prevent showing redundant roles for this user

---
 lms/templates/discussion/_user_profile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/discussion/_user_profile.html b/lms/templates/discussion/_user_profile.html
index 7bf58a256a..1ab0f2fee7 100644
--- a/lms/templates/discussion/_user_profile.html
+++ b/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">

From a32be2958cee3dafcb0b49a1f5dee026c8ce35e8 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@edx.org>
Date: Fri, 14 Sep 2012 16:00:09 -0400
Subject: [PATCH 2/2] Change 'View discussion' link on user profile page to be
 a simple link rather than AJAX.

---
 .../discussion/views/discussion_thread_profile_view.coffee    | 3 +--
 lms/templates/discussion/mustache/_profile_thread.mustache    | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_profile_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_profile_view.coffee
index 410c573d08..fa7a8a86b7 100644
--- a/lms/static/coffee/src/discussion/views/discussion_thread_profile_view.coffee
+++ b/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))
diff --git a/lms/templates/discussion/mustache/_profile_thread.mustache b/lms/templates/discussion/mustache/_profile_thread.mustache
index 775d6d4abf..7b1a406827 100644
--- a/lms/templates/discussion/mustache/_profile_thread.mustache
+++ b/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>