From 14b0cc019f1f32676c00f971f212d7bde88992b9 Mon Sep 17 00:00:00 2001
From: Kevin Chugh <kevinchugh@gmail.com>
Date: Thu, 6 Dec 2012 16:26:08 -0500
Subject: [PATCH] remove debug placeholders, finalize render of comments,
 flagging working on posts, replies, and comments

---
 .../django_comment_client/forum/views.py           |  3 ++-
 .../views/response_comment_show_view.coffee        | 14 +++++++++++---
 .../discussion/_underscore_templates.html          |  5 +----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py
index bcd1477553..2516843775 100644
--- a/lms/djangoapps/django_comment_client/forum/views.py
+++ b/lms/djangoapps/django_comment_client/forum/views.py
@@ -72,7 +72,6 @@ def inline_discussion(request, course_id, discussion_id):
     """
     Renders JSON for DiscussionModules
     """
-
     course = get_course_with_access(request.user, course_id, 'load')
 
     try:
@@ -179,6 +178,8 @@ def single_thread(request, course_id, discussion_id, thread_id):
         # TODO: Remove completely or switch back to server side rendering
         # html = render_to_string('discussion/_ajax_single_thread.html', context)
         content = utils.safe_content(thread.to_dict())
+        log.debug("*************************")
+        log.debug(content)
         if courseware_context:
             content.update(courseware_context)
         return utils.JsonResponse({
diff --git a/lms/static/coffee/src/discussion/views/response_comment_show_view.coffee b/lms/static/coffee/src/discussion/views/response_comment_show_view.coffee
index 6fc2d4b5f5..e1a7eebd53 100644
--- a/lms/static/coffee/src/discussion/views/response_comment_show_view.coffee
+++ b/lms/static/coffee/src/discussion/views/response_comment_show_view.coffee
@@ -1,10 +1,14 @@
 if Backbone?
   class @ResponseCommentShowView extends DiscussionContentView
   
-  events:
-    "click .discussion-flag-abuse": "toggleFlagAbuse"  
+    events:
+      "click .discussion-flag-abuse": "toggleFlagAbuse"  
 
     tagName: "li"
+    
+    initialize: ->
+        super()
+        @model.on "change", @updateModelDetails
 
     render: ->
       @template = _.template($("#response-comment-show-template").html())
@@ -14,6 +18,7 @@ if Backbone?
       @initLocal()
       @delegateEvents()
       @renderAttrs()
+      @renderFlagged()
       @markAsStaff()
       @$el.find(".timeago").timeago()
       @convertMath()
@@ -45,6 +50,9 @@ if Backbone?
         @$("[data-role=thread-flag]").removeClass("notflagged")
       else
         @$("[data-role=thread-flag]").removeClass("flagged")  
-        @$("[data-role=thread-flag]").addClass("notflagged")      
+        @$("[data-role=thread-flag]").addClass("notflagged")  
+      
+    updateModelDetails: =>
+      @renderFlagged()
         
         
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index 6bbb9575f1..abd1b0ae28 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -44,7 +44,6 @@
       </header>
 
       <div class="post-body">${'<%- body %>'}</div>
-       POST 
       <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="flag">                
       <i class="icon"></i><span class="flag-label">Report Misuse</span></div>      
         
@@ -111,7 +110,6 @@
         <p class="posted-details" title="${'<%- created_at %>'}">${'<%- created_at %>'}</p>
     </header>
     <div class="response-local"><div class="response-body">${"<%- body %>"}</div>
-    RESPONSE
     <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="flag">                
       <i class="icon"></i><span class="flag-label">Report Misuse</span></div>
     </div>
@@ -137,9 +135,8 @@
 <script type="text/template" id="response-comment-show-template">
   <div id="comment_${'<%- id %>'}">
     <div class="response-body">${'<%- body %>'}</div>
-    COMMENT
     <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="flag">                
-      <i class="icon"></i><span class="flag-label">Report Misuse</span></div> 
+      <i class="icon"></i><span class="flag-label"></span></div> 
     <p class="posted-details">&ndash;posted <span class="timeago" title="${'<%- created_at %>'}">${'<%- created_at %>'}</span> by
         ${"<% if (obj.username) { %>"}
         <a href="${'<%- user_url %>'}" class="profile-link">${'<%- username %>'}</a>