Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

first pass

Browse Source
This commit is contained in:
Your Name
2013-03-01 10:45:48 -05:00
parent 32e5f72c16
commit 8a953241c1
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lms/djangoapps/django_comment_client/forum/views.py
View File

@@ -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({

17
lms/templates/discussion/_new_post.html
View File

@@ -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