modify anonymity handling; display comments count

lms/djangoapps/django_comment_client/base/views.py

@@ -49,6 +49,10 @@ def create_thread(request, course_id, commentable_id):
     attributes = extract(request.POST, ['body', 'title', 'tags'])
     attributes['user_id'] = request.user.id
     attributes['course_id'] = course_id
+    if request.POST.get('anonymous', 'false').lower() == 'true':
+        attributes['anonymous'] = True
+    if request.POST.get('autowatch', 'false').lower() == 'true':
+        attributes['auto_subscribe'] = True
     response = comment_client.create_thread(commentable_id, attributes)
     return JsonResponse(response)
 
@@ -64,11 +68,13 @@ def update_thread(request, course_id, thread_id):
 @require_POST
 def create_comment(request, course_id, thread_id):
     attributes = extract(request.POST, ['body'])
-    if request.POST.get('anonymous', 'false').lower() == 'false':
-        attributes['user_id'] = request.user.id
+    attributes['user_id'] = request.user.id
     attributes['course_id'] = course_id
-    attributes['auto_subscribe'] = bool(request.POST.get('autowatch', False))
-    print attributes
+    print request.POST
+    if request.POST.get('anonymous', 'false').lower() == 'true':
+        attributes['anonymous'] = True
+    if request.POST.get('autowatch', 'false').lower() == 'true':
+        attributes['auto_subscribe'] = True
     response = comment_client.create_comment(thread_id, attributes)
     return JsonResponse(response)
 
@@ -99,10 +105,12 @@ def endorse_comment(request, course_id, comment_id):
 @require_POST
 def create_sub_comment(request, course_id, comment_id):
     attributes = extract(request.POST, ['body'])
-    if request.POST.get('anonymous', 'false').lower() == 'false':
-        attributes['user_id'] = request.user.id
+    attributes['user_id'] = request.user.id
     attributes['course_id'] = course_id
-    attributes['auto_subscribe'] = bool(request.POST.get('autowatch', False))
+    if request.POST.get('anonymous', 'false').lower() == 'true':
+        attributes['anonymous'] = True
+    if request.POST.get('autowatch', 'false').lower() == 'true':
+        attributes['auto_subscribe'] = True
     response = comment_client.create_sub_comment(comment_id, attributes)
     return JsonResponse(response)
 

lms/templates/discussion/thread.html

@@ -4,7 +4,6 @@
 <%! import urllib %>
 
 <%def name="render_thread(course_id, thread, edit_thread=False, show_comments=False)">
-  
   <div class="thread" _id="${thread['id']}">
     ${render_content(thread, "thread", edit_thread=edit_thread, show_comments=show_comments)}
     % if show_comments:
@@ -83,10 +82,13 @@
 
 <%def name="render_info(content)">
   ${time_ago_in_words(parse(content['updated_at']))} ago by
-  % if content.get('user_id', False):
-    user No.${content['user_id']}
-  % else:
+  % if content['anonymous']:
     anonymous
+  % else:
+    user No.${content['user_id']}
+  % endif
+  % if content.get('comments_count', -1) >= 0:
+    / ${content['comments_count']} comment(s)
   % endif
 </%def>