Implement forum cohort visibility labels correctly

TNL-25
This commit is contained in:
Andy Armstrong
2014-08-25 18:25:22 -04:00
parent 7eb3a22d11
commit 8349dbfa42
10 changed files with 217 additions and 138 deletions

View File

@@ -3,6 +3,7 @@ from collections import defaultdict
import logging
from datetime import datetime
from course_groups.cohorts import get_cohort_by_id
from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
from django.db import connection
@@ -371,7 +372,7 @@ def safe_content(content, course_id, is_staff=False):
'updated_at', 'depth', 'type', 'commentable_id', 'comments_count',
'at_position_list', 'children', 'highlighted_title', 'highlighted_body',
'courseware_title', 'courseware_url', 'unread_comments_count',
'read', 'group_id', 'group_name', 'group_string', 'pinned', 'abuse_flaggers',
'read', 'group_id', 'group_name', 'pinned', 'abuse_flaggers',
'stats', 'resp_skip', 'resp_limit', 'resp_total', 'thread_type',
'endorsed_responses', 'non_endorsed_responses', 'non_endorsed_resp_total',
'endorsement',
@@ -411,3 +412,11 @@ def safe_content(content, course_id, is_staff=False):
content[child_content_key] = safe_children
return content
def add_thread_group_name(thread_info, course_key):
"""
Augment the specified thread info to include the group name if a group id is present.
"""
if thread_info.get('group_id') is not None:
thread_info['group_name'] = get_cohort_by_id(course_key, thread_info.get('group_id')).name