From 6a816e453f97b85b9fabfdb4c81a61607071c17c Mon Sep 17 00:00:00 2001
From: Rocky Duan <dementrock@gmail.com>
Date: Tue, 24 Jul 2012 16:50:21 -0400
Subject: [PATCH] watch/unwatch, vote status enabled in all views

---
 lms/djangoapps/django_comment_client/forum/views.py | 4 +++-
 lms/templates/discussion/index.html                 | 4 ----
 lms/templates/discussion/inline.html                | 5 +++++
 lms/templates/discussion/single_thread.html         | 5 +++++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py
index a7502bac49..dfff24e5bf 100644
--- a/lms/djangoapps/django_comment_client/forum/views.py
+++ b/lms/djangoapps/django_comment_client/forum/views.py
@@ -95,6 +95,7 @@ def render_discussion(request, threads, discussion_id=None, search_text=''):
         'threads': threads,
         'discussion_id': discussion_id,
         'search_bar': render_search_bar(request, discussion_id, text=search_text),
+        'user_info': comment_client.get_user_info(request.user.id, raw=True),
     }
     return render_to_string('discussion/inline.html', context)
 
@@ -139,6 +140,7 @@ def forum_form_discussion(request, course_id, discussion_id):
 def render_single_thread(request, thread_id):
     context = {
         'thread': comment_client.get_thread(thread_id, recursive=True),
+        'user_info': comment_client.get_user_info(request.user.id, raw=True),
     }
     return render_to_string('discussion/single_thread.html', context)
 
@@ -149,7 +151,7 @@ def single_thread(request, thread_id):
         'init': '',
         'content': render_single_thread(request, thread_id),
         'accordion': '',
-        'user_info': json.dumps(comment_client.get_user_info(request.user.id)),
+        'user_info': comment_client.get_user_info(request.user.id, raw=True),
     }
 
     return render_to_response('discussion/index.html', context)
diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html
index c970bfbcf4..7b35863377 100644
--- a/lms/templates/discussion/index.html
+++ b/lms/templates/discussion/index.html
@@ -8,10 +8,6 @@
 </%block>
 
 <%block name="js_extra">
-<script type="text/javascript">
-  var user_info = JSON.parse('${user_info}');
-</script>
-
 </%block>
 
 ##<%include file="../course_navigation.html" args="active_page='discussion'" />
diff --git a/lms/templates/discussion/inline.html b/lms/templates/discussion/inline.html
index e4f0ca43d3..d9d5bb8df1 100644
--- a/lms/templates/discussion/inline.html
+++ b/lms/templates/discussion/inline.html
@@ -14,3 +14,8 @@
     ${renderer.render_thread(thread, edit_thread=False, show_comments=False)}
   % endfor
 </section>
+
+<script type="text/javascript">
+  var user_info = JSON.parse('${user_info}');
+</script>
+
diff --git a/lms/templates/discussion/single_thread.html b/lms/templates/discussion/single_thread.html
index 28b17ff477..0545b2ba4a 100644
--- a/lms/templates/discussion/single_thread.html
+++ b/lms/templates/discussion/single_thread.html
@@ -4,3 +4,8 @@
   <a class="discussion-title" href="javascript:void(0)">Discussion</a>
   ${renderer.render_thread(thread, edit_thread=True, show_comments=True)}
 </section>
+
+<script type="text/javascript">
+  var user_info = JSON.parse('${user_info}');
+</script>
+