From 8a953241c113cbd8b59620f0ea7cb09a7b47ac72 Mon Sep 17 00:00:00 2001
From: Your Name <kevinchugh@edx.org>
Date: Fri, 1 Mar 2013 10:45:48 -0500
Subject: [PATCH] first pass

---
 .../django_comment_client/forum/views.py      | 21 ++++++++++---------
 lms/templates/discussion/_new_post.html       | 17 +++++++--------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py
index efacbc1b4e..bb1dc00339 100644
--- a/lms/djangoapps/django_comment_client/forum/views.py
+++ b/lms/djangoapps/django_comment_client/forum/views.py
@@ -147,17 +147,18 @@ def inline_discussion(request, course_id, discussion_id):
               
       else:
       #otherwise, just make a dictionary of two 
-          user_cohort = get_cohort(cc_user, course_id)
-          if user_cohort:
-              user_cohort_name = user_cohort.name
-              user_cohort_id = user_cohort.id
-          else:
-              user_cohort_name = user_cohort_id = None
+          #user_cohort = get_cohort(cc_user, course_id)
+          #if user_cohort:
+          #    user_cohort_name = user_cohort.name
+          #    user_cohort_id = user_cohort.id
+          #else:
+          #    user_cohort_name = user_cohort_id = None
+          cohorts_list = None
           
-          if user_cohort:
-              cohorts_list.append({'name':user_cohort_name, 'id':user_cohort_id})
-          else:
-              cohorts_list = None
+          #if user_cohort:
+          #    cohorts_list.append({'name':user_cohort_name, 'id':user_cohort_id})
+          #else:
+          #    cohorts_list = None
           
           
     return utils.JsonResponse({
diff --git a/lms/templates/discussion/_new_post.html b/lms/templates/discussion/_new_post.html
index 223b593368..feaabf894c 100644
--- a/lms/templates/discussion/_new_post.html
+++ b/lms/templates/discussion/_new_post.html
@@ -46,21 +46,18 @@
                     %elif course.metadata.get("allow_anonymous_to_peers", False):
                         <input type="checkbox" name="anonymous_to_peers" class="discussion-anonymous-to-peers" id="new-post-anonymous-to-peers"><label for="new-post-anonymous-to-peers">post anonymously to classmates</label>
                     %endif
-                    %if is_course_cohorted:
+                    %if is_course_cohorted and is_moderator:
                     <div class="form-group-label choose-cohort">
                         Make visible to:
                         <select class="group-filter-select new-post-group" name = "group_id"> 
                             <option value="">All Groups</option>
-                            %if is_moderator:
-                              %for c in cohorts:
-                                <option value="${c.id}">${c.name}</option>
-                              %endfor
-                            %else:
-                                %if user_cohort:
-                                    <option value="${user_cohort}">My Cohort</option>
+                            %for c in cohorts:
+                                <option value="${c.id}" 
+                                %if user_cohort and user_cohort == c.id
+                                    selected
                                 %endif
-                            %endif
-
+                                >${c.name}</option>
+                            %endfor
                         </select>
                     </div>
                     %endif