clean up commments
This commit is contained in:
@@ -96,6 +96,7 @@ def create_thread(request, course_id, commentable_id):
|
||||
|
||||
#kevinchugh because the new requirement is that all groups will be determined
|
||||
#by the group id in the request this all goes away
|
||||
#not anymore, only for admins
|
||||
|
||||
# Cohort the thread if the commentable is cohorted.
|
||||
if is_commentable_cohorted(course_id, commentable_id):
|
||||
@@ -110,12 +111,10 @@ def create_thread(request, course_id, commentable_id):
|
||||
else:
|
||||
# regular users always post with their own id.
|
||||
group_id = user_group_id
|
||||
# group_id = post.get('group_id')
|
||||
|
||||
if group_id:
|
||||
thread.update_attributes(group_id=group_id)
|
||||
|
||||
#log.debug("Saving thread %r", thread.attributes)
|
||||
thread.save()
|
||||
|
||||
if post.get('auto_subscribe', 'false').lower() == 'true':
|
||||
|
||||
@@ -142,29 +142,15 @@ def inline_discussion(request, course_id, discussion_id):
|
||||
|
||||
#if you're a mod, send all cohorts and let you pick
|
||||
|
||||
|
||||
|
||||
if is_moderator:
|
||||
cohorts = get_course_cohorts(course_id)
|
||||
for c in cohorts:
|
||||
cohorts_list.append({'name':c.name, 'id':c.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
|
||||
#students don't get to choose
|
||||
cohorts_list = None
|
||||
|
||||
#if user_cohort:
|
||||
# cohorts_list.append({'name':user_cohort_name, 'id':user_cohort_id})
|
||||
#else:
|
||||
# cohorts_list = None
|
||||
|
||||
|
||||
return utils.JsonResponse({
|
||||
'discussion_data': map(utils.safe_content, threads),
|
||||
'user_info': user_info,
|
||||
|
||||
Reference in New Issue
Block a user