+
diff --git a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
index bdd6cde429..cf592aab79 100644
--- a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
+++ b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html
@@ -81,7 +81,7 @@ from openedx.core.djangolib.markup import HTML
## Include Underscore templates
<%block name="header_extras">
-% for template_name in ["cohorts", "enrollment-code-lookup-links", "cohort-editor", "cohort-group-header", "cohort-selector", "cohort-form", "notification", "cohort-state", "cohort-discussions-inline", "cohort-discussions-course-wide", "cohort-discussions-category", "cohort-discussions-subcategory", "certificate-white-list", "certificate-white-list-editor", "certificate-bulk-white-list", "certificate-invalidation"]:
+% for template_name in ["cohorts", "discussions", "enrollment-code-lookup-links", "cohort-editor", "cohort-group-header", "cohort-selector", "cohort-form", "notification", "cohort-state", "divided-discussions-inline", "divided-discussions-course-wide", "cohort-discussions-category", "cohort-discussions-subcategory", "certificate-white-list", "certificate-white-list-editor", "certificate-bulk-white-list", "certificate-invalidation"]:
diff --git a/lms/urls.py b/lms/urls.py
index ca99a2740b..5946f8af74 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -504,6 +504,15 @@ urlpatterns += (
include(COURSE_URLS)
),
+ # Discussions Management
+ url(
+ r'^courses/{}/discussions/settings$'.format(
+ settings.COURSE_KEY_PATTERN,
+ ),
+ 'openedx.core.djangoapps.course_groups.views.course_discussions_settings_handler',
+ name='course_discussions_settings',
+ ),
+
# Cohorts management
url(
r'^courses/{}/cohorts/settings$'.format(
@@ -548,11 +557,11 @@ urlpatterns += (
name='debug_cohort_mgmt',
),
url(
- r'^courses/{}/cohorts/topics$'.format(
+ r'^courses/{}/discussion/topics$'.format(
settings.COURSE_KEY_PATTERN,
),
- 'openedx.core.djangoapps.course_groups.views.cohort_discussion_topics',
- name='cohort_discussion_topics',
+ 'openedx.core.djangoapps.course_groups.views.discussion_topics',
+ name='discussion_topics',
),
url(
r'^courses/{}/verified_track_content/settings'.format(
diff --git a/openedx/core/djangoapps/course_groups/cohorts.py b/openedx/core/djangoapps/course_groups/cohorts.py
index 6e745766b9..5d919124b7 100644
--- a/openedx/core/djangoapps/course_groups/cohorts.py
+++ b/openedx/core/djangoapps/course_groups/cohorts.py
@@ -121,6 +121,16 @@ def is_course_cohorted(course_key):
return _get_course_cohort_settings(course_key).is_cohorted
+def get_course_cohort_id(course_key):
+ """
+ Given a course key, return the int id for the cohort settings.
+
+ Raises:
+ Http404 if the course doesn't exist.
+ """
+ return _get_course_cohort_settings(course_key).id
+
+
def set_course_cohorted(course_key, cohorted):
"""
Given a course course and a boolean, sets whether or not the course is cohorted.
diff --git a/openedx/core/djangoapps/course_groups/tests/helpers.py b/openedx/core/djangoapps/course_groups/tests/helpers.py
index 87ce36ed14..d22e5cb7bc 100644
--- a/openedx/core/djangoapps/course_groups/tests/helpers.py
+++ b/openedx/core/djangoapps/course_groups/tests/helpers.py
@@ -135,43 +135,72 @@ def config_course_cohorts_legacy(
pass
+# pylint: disable=dangerous-default-value
+def config_course_discussions(
+ course,
+ discussion_topics={},
+ divided_discussions=[],
+ always_divide_inline_discussions=False
+):
+ """
+ Set discussions and configure divided discussions for a course.
+
+ Arguments:
+ course: CourseDescriptor
+ discussion_topics (Dict): Discussion topic names. Picks ids and
+ sort_keys automatically.
+ divided_discussions: Discussion topics to divide. Converts the
+ list to use the same ids as discussion topic names.
+ always_divide_inline_discussions (bool): Whether inline discussions
+ should be divided by default.
+
+ Returns:
+ Nothing -- modifies course in place.
+ """
+
+ def to_id(name):
+ """Convert name to id."""
+ return topic_name_to_id(course, name)
+
+ set_course_discussion_settings(
+ course.id,
+ divided_discussions=[to_id(name) for name in divided_discussions],
+ always_divide_inline_discussions=always_divide_inline_discussions,
+ division_scheme=CourseDiscussionSettings.COHORT,
+ )
+
+ course.discussion_topics = dict((name, {"sort_key": "A", "id": to_id(name)})
+ for name in discussion_topics)
+ try:
+ # Not implemented for XMLModulestore, which is used by test_cohorts.
+ modulestore().update_item(course, ModuleStoreEnum.UserID.test)
+ except NotImplementedError:
+ pass
+
+
# pylint: disable=dangerous-default-value
def config_course_cohorts(
course,
is_cohorted,
auto_cohorts=[],
manual_cohorts=[],
- discussion_topics=[],
- divided_discussions=[],
- always_divide_inline_discussions=False
):
"""
- Set discussions and configure cohorts for a course.
+ Set and configure cohorts for a course.
Arguments:
course: CourseDescriptor
is_cohorted (bool): Is the course cohorted?
auto_cohorts (list): Names of auto cohorts to create.
manual_cohorts (list): Names of manual cohorts to create.
- discussion_topics (list): Discussion topic names. Picks ids and
- sort_keys automatically.
- divided_discussions: Discussion topics to divide. Converts the
- list to use the same ids as discussion topic names.
- always_divide_inline_discussions (bool): Whether inline discussions
- should be divided by default.
Returns:
Nothing -- modifies course in place.
"""
- def to_id(name):
- """Convert name to id."""
- return topic_name_to_id(course, name)
set_course_cohorted(course.id, is_cohorted)
set_course_discussion_settings(
course.id,
- divided_discussions=[to_id(name) for name in divided_discussions],
- always_divide_inline_discussions=always_divide_inline_discussions,
division_scheme=CourseDiscussionSettings.COHORT,
)
@@ -183,8 +212,6 @@ def config_course_cohorts(
cohort = CohortFactory(course_id=course.id, name=cohort_name)
CourseCohortFactory(course_user_group=cohort, assignment_type=CourseCohort.MANUAL)
- course.discussion_topics = dict((name, {"sort_key": "A", "id": to_id(name)})
- for name in discussion_topics)
try:
# Not implemented for XMLModulestore, which is used by test_cohorts.
modulestore().update_item(course, ModuleStoreEnum.UserID.test)
diff --git a/openedx/core/djangoapps/course_groups/tests/test_views.py b/openedx/core/djangoapps/course_groups/tests/test_views.py
index 870ae9c945..14ef5acfee 100644
--- a/openedx/core/djangoapps/course_groups/tests/test_views.py
+++ b/openedx/core/djangoapps/course_groups/tests/test_views.py
@@ -25,15 +25,17 @@ from openedx.core.djangolib.testing.utils import skip_unless_lms
from ..models import CourseUserGroup, CourseCohort
from ..views import (
- course_cohort_settings_handler, cohort_handler, users_in_cohort, add_users_to_cohort, remove_user_from_cohort,
- link_cohort_to_partition_group, cohort_discussion_topics
+ course_cohort_settings_handler, course_discussions_settings_handler,
+ cohort_handler, users_in_cohort,
+ add_users_to_cohort, remove_user_from_cohort,
+ link_cohort_to_partition_group, discussion_topics
)
from ..cohorts import (
get_cohort, get_cohort_by_name, get_cohort_by_id,
DEFAULT_COHORT_NAME, get_group_info_for_cohort
)
from .helpers import (
- config_course_cohorts, config_course_cohorts_legacy, CohortFactory, CourseCohortFactory, topic_name_to_id
+ config_course_cohorts, config_course_discussions, config_course_cohorts_legacy, CohortFactory, CourseCohortFactory, topic_name_to_id
)
@@ -99,13 +101,13 @@ class CohortViewsTestCase(ModuleStoreTestCase):
view_args.insert(0, request)
self.assertRaises(Http404, view, *view_args)
- def create_cohorted_discussions(self):
+ def create_divided_discussions(self):
"""
- Set up a cohorted discussion in the system, complete with all the fixings
+ Set up a divided discussion in the system, complete with all the fixings
"""
- cohorted_inline_discussions = ['Topic A']
- cohorted_course_wide_discussions = ["Topic B"]
- cohorted_discussions = cohorted_inline_discussions + cohorted_course_wide_discussions
+ divided_inline_discussions = ['Topic A']
+ divided_course_wide_discussions = ["Topic B"]
+ divided_discussions = divided_inline_discussions + divided_course_wide_discussions
# inline discussion
ItemFactory.create(
@@ -124,10 +126,14 @@ class CohortViewsTestCase(ModuleStoreTestCase):
config_course_cohorts(
self.course,
is_cohorted=True,
- discussion_topics=discussion_topics,
- divided_discussions=cohorted_discussions
)
- return cohorted_inline_discussions, cohorted_course_wide_discussions
+
+ config_course_discussions(
+ self.course,
+ discussion_topics=discussion_topics,
+ divided_discussions=divided_discussions
+ )
+ return divided_inline_discussions, divided_course_wide_discussions
def get_handler(self, course, cohort=None, expected_response_code=200, handler=cohort_handler):
"""
@@ -177,6 +183,129 @@ class CohortViewsTestCase(ModuleStoreTestCase):
return json.loads(response.content)
+@attr(shard=2)
+class CourseDiscussionsHandlerTestCase(CohortViewsTestCase):
+ """
+ Tests the course_discussion_settings_handler
+ """
+ def get_expected_response(self):
+ """
+ Returns the static response dict.
+ """
+ return {
+ u'always_divide_inline_discussions': False,
+ u'divided_inline_discussions': [],
+ u'divided_course_wide_discussions': [],
+ u'id': 1
+ }
+
+ def test_non_staff(self):
+ """
+ Verify that we cannot access course_discussions_settings_handler if we're a non-staff user.
+ """
+ self._verify_non_staff_cannot_access(course_discussions_settings_handler, "GET", [unicode(self.course.id)])
+ self._verify_non_staff_cannot_access(course_discussions_settings_handler, "PATCH", [unicode(self.course.id)])
+
+ def test_update_always_divide_inline_discussion_settings(self):
+ """
+ Verify that course_discussions_settings_handler is working for always_divide_inline_discussions via HTTP PATCH.
+ """
+ config_course_cohorts(self.course, is_cohorted=True)
+
+ response = self.get_handler(self.course, handler=course_discussions_settings_handler)
+
+ expected_response = self.get_expected_response()
+
+ self.assertEqual(response, expected_response)
+
+ expected_response['always_divide_inline_discussions'] = True
+ response = self.patch_handler(self.course, data=expected_response, handler=course_discussions_settings_handler)
+
+ self.assertEqual(response, expected_response)
+
+ def test_update_course_wide_discussion_settings(self):
+ """
+ Verify that course_discussions_settings_handler is working for divided_course_wide_discussions via HTTP PATCH.
+ """
+ # course-wide discussion
+ discussion_topics = {
+ "Topic B": {"id": "Topic B"},
+ }
+
+ config_course_cohorts(self.course, is_cohorted=True)
+ config_course_discussions(self.course, discussion_topics=discussion_topics)
+
+ response = self.get_handler(self.course, handler=course_discussions_settings_handler)
+
+ expected_response = self.get_expected_response()
+ self.assertEqual(response, expected_response)
+
+ expected_response['divided_course_wide_discussions'] = [topic_name_to_id(self.course, "Topic B")]
+ response = self.patch_handler(self.course, data=expected_response, handler=course_discussions_settings_handler)
+
+ self.assertEqual(response, expected_response)
+
+ def test_update_inline_discussion_settings(self):
+ """
+ Verify that course_discussions_settings_handler is working for divided_inline_discussions via HTTP PATCH.
+ """
+ config_course_cohorts(self.course, is_cohorted=True)
+
+ response = self.get_handler(self.course, handler=course_discussions_settings_handler)
+
+ expected_response = self.get_expected_response()
+ self.assertEqual(response, expected_response)
+
+ now = datetime.now()
+ # inline discussion
+ ItemFactory.create(
+ parent_location=self.course.location,
+ category="discussion",
+ discussion_id="Topic_A",
+ discussion_category="Chapter",
+ discussion_target="Discussion",
+ start=now
+ )
+
+ expected_response['divided_inline_discussions'] = ["Topic_A"]
+ response = self.patch_handler(self.course, data=expected_response, handler=course_discussions_settings_handler)
+
+ self.assertEqual(response, expected_response)
+
+ def test_get_settings(self):
+ """
+ Verify that course_discussions_settings_handler is working for HTTP GET.
+ """
+ divided_inline_discussions, divided_course_wide_discussions = self.create_divided_discussions()
+
+ response = self.get_handler(self.course, handler=course_discussions_settings_handler)
+ expected_response = self.get_expected_response()
+
+ expected_response['divided_inline_discussions'] = [topic_name_to_id(self.course, name)
+ for name in divided_inline_discussions]
+ expected_response['divided_course_wide_discussions'] = [topic_name_to_id(self.course, name)
+ for name in divided_course_wide_discussions]
+
+ self.assertEqual(response, expected_response)
+
+ def test_update_settings_with_invalid_field_data_type(self):
+ """
+ Verify that course_discussions_settings_handler return HTTP 400 if field data type is incorrect.
+ """
+ config_course_cohorts(self.course, is_cohorted=True)
+
+ response = self.patch_handler(
+ self.course,
+ data={'always_divide_inline_discussions': ''},
+ expected_response_code=400,
+ handler=course_discussions_settings_handler
+ )
+ self.assertEqual(
+ "Incorrect field type for `{}`. Type must be `{}`".format('always_divide_inline_discussions', bool.__name__),
+ response.get("error")
+ )
+
+
@attr(shard=2)
class CourseCohortSettingsHandlerTestCase(CohortViewsTestCase):
"""
@@ -189,9 +318,6 @@ class CourseCohortSettingsHandlerTestCase(CohortViewsTestCase):
"""
return {
'is_cohorted': True,
- 'always_cohort_inline_discussions': False,
- 'cohorted_inline_discussions': [],
- 'cohorted_course_wide_discussions': [],
'id': 1
}
@@ -202,22 +328,6 @@ class CourseCohortSettingsHandlerTestCase(CohortViewsTestCase):
self._verify_non_staff_cannot_access(course_cohort_settings_handler, "GET", [unicode(self.course.id)])
self._verify_non_staff_cannot_access(course_cohort_settings_handler, "PATCH", [unicode(self.course.id)])
- def test_get_settings(self):
- """
- Verify that course_cohort_settings_handler is working for HTTP GET.
- """
- cohorted_inline_discussions, cohorted_course_wide_discussions = self.create_cohorted_discussions()
-
- response = self.get_handler(self.course, handler=course_cohort_settings_handler)
- expected_response = self.get_expected_response()
-
- expected_response['cohorted_inline_discussions'] = [topic_name_to_id(self.course, name)
- for name in cohorted_inline_discussions]
- expected_response['cohorted_course_wide_discussions'] = [topic_name_to_id(self.course, name)
- for name in cohorted_course_wide_discussions]
-
- self.assertEqual(response, expected_response)
-
def test_update_is_cohorted_settings(self):
"""
Verify that course_cohort_settings_handler is working for is_cohorted via HTTP PATCH.
@@ -235,71 +345,6 @@ class CourseCohortSettingsHandlerTestCase(CohortViewsTestCase):
self.assertEqual(response, expected_response)
- def test_update_always_cohort_inline_discussion_settings(self):
- """
- Verify that course_cohort_settings_handler is working for always_cohort_inline_discussions via HTTP PATCH.
- """
- config_course_cohorts(self.course, is_cohorted=True)
-
- response = self.get_handler(self.course, handler=course_cohort_settings_handler)
-
- expected_response = self.get_expected_response()
-
- self.assertEqual(response, expected_response)
-
- expected_response['always_cohort_inline_discussions'] = True
- response = self.patch_handler(self.course, data=expected_response, handler=course_cohort_settings_handler)
-
- self.assertEqual(response, expected_response)
-
- def test_update_course_wide_discussion_settings(self):
- """
- Verify that course_cohort_settings_handler is working for cohorted_course_wide_discussions via HTTP PATCH.
- """
- # course-wide discussion
- discussion_topics = {
- "Topic B": {"id": "Topic B"},
- }
-
- config_course_cohorts(self.course, is_cohorted=True, discussion_topics=discussion_topics)
-
- response = self.get_handler(self.course, handler=course_cohort_settings_handler)
-
- expected_response = self.get_expected_response()
- self.assertEqual(response, expected_response)
-
- expected_response['cohorted_course_wide_discussions'] = [topic_name_to_id(self.course, "Topic B")]
- response = self.patch_handler(self.course, data=expected_response, handler=course_cohort_settings_handler)
-
- self.assertEqual(response, expected_response)
-
- def test_update_inline_discussion_settings(self):
- """
- Verify that course_cohort_settings_handler is working for cohorted_inline_discussions via HTTP PATCH.
- """
- config_course_cohorts(self.course, is_cohorted=True)
-
- response = self.get_handler(self.course, handler=course_cohort_settings_handler)
-
- expected_response = self.get_expected_response()
- self.assertEqual(response, expected_response)
-
- now = datetime.now()
- # inline discussion
- ItemFactory.create(
- parent_location=self.course.location,
- category="discussion",
- discussion_id="Topic_A",
- discussion_category="Chapter",
- discussion_target="Discussion",
- start=now
- )
-
- expected_response['cohorted_inline_discussions'] = ["Topic_A"]
- response = self.patch_handler(self.course, data=expected_response, handler=course_cohort_settings_handler)
-
- self.assertEqual(response, expected_response)
-
def test_update_settings_with_missing_field(self):
"""
Verify that course_cohort_settings_handler return HTTP 400 if required data field is missing from post data.
@@ -315,17 +360,6 @@ class CourseCohortSettingsHandlerTestCase(CohortViewsTestCase):
"""
config_course_cohorts(self.course, is_cohorted=True)
- response = self.patch_handler(
- self.course,
- data={'always_cohort_inline_discussions': ''},
- expected_response_code=400,
- handler=course_cohort_settings_handler
- )
- self.assertEqual(
- "Incorrect field type for `{}`. Type must be `{}`".format('always_divide_inline_discussions', bool.__name__),
- response.get("error")
- )
-
response = self.patch_handler(
self.course,
data={'is_cohorted': ''},
@@ -1240,25 +1274,25 @@ class RemoveUserFromCohortTestCase(CohortViewsTestCase):
@attr(shard=2)
@skip_unless_lms
-class CourseCohortDiscussionTopicsTestCase(CohortViewsTestCase):
+class CourseDividedDiscussionTopicsTestCase(CohortViewsTestCase):
"""
- Tests the `cohort_discussion_topics` view.
+ Tests the `divide_discussion_topics` view.
"""
def test_non_staff(self):
"""
- Verify that we cannot access cohort_discussion_topics if we're a non-staff user.
+ Verify that we cannot access divide_discussion_topics if we're a non-staff user.
"""
- self._verify_non_staff_cannot_access(cohort_discussion_topics, "GET", [unicode(self.course.id)])
+ self._verify_non_staff_cannot_access(discussion_topics, "GET", [unicode(self.course.id)])
def test_get_discussion_topics(self):
"""
- Verify that course_cohort_settings_handler is working for HTTP GET.
+ Verify that divide_discussion_topics is working for HTTP GET.
"""
# create inline & course-wide discussion to verify the different map.
- self.create_cohorted_discussions()
+ self.create_divided_discussions()
- response = self.get_handler(self.course, handler=cohort_discussion_topics)
+ response = self.get_handler(self.course, handler=discussion_topics)
start_date = response['inline_discussions']['subcategories']['Chapter']['start_date']
expected_response = {
"course_wide_discussions": {
diff --git a/openedx/core/djangoapps/course_groups/views.py b/openedx/core/djangoapps/course_groups/views.py
index 0d304c3035..d955254ae0 100644
--- a/openedx/core/djangoapps/course_groups/views.py
+++ b/openedx/core/djangoapps/course_groups/views.py
@@ -64,20 +64,29 @@ def unlink_cohort_partition_group(cohort):
# pylint: disable=invalid-name
-def _get_course_cohort_settings_representation(course, is_cohorted, course_discussion_settings):
+def _get_course_cohort_settings_representation(cohort_id, is_cohorted):
"""
Returns a JSON representation of a course cohort settings.
"""
+ return {
+ 'id': cohort_id,
+ 'is_cohorted': is_cohorted,
+ }
+
+
+def _get_course_discussion_settings_representation(course, course_discussion_settings):
+ """
+ Returns a JSON representation of a course discussion settings.
+ """
divided_course_wide_discussions, divided_inline_discussions = get_divided_discussions(
course, course_discussion_settings
)
return {
'id': course_discussion_settings.id,
- 'is_cohorted': is_cohorted,
- 'cohorted_inline_discussions': divided_inline_discussions,
- 'cohorted_course_wide_discussions': divided_course_wide_discussions,
- 'always_cohort_inline_discussions': course_discussion_settings.always_divide_inline_discussions,
+ 'divided_inline_discussions': divided_inline_discussions,
+ 'divided_course_wide_discussions': divided_course_wide_discussions,
+ 'always_divide_inline_discussions': course_discussion_settings.always_divide_inline_discussions,
}
@@ -117,6 +126,61 @@ def get_divided_discussions(course, discussion_settings):
return divided_course_wide_discussions, divided_inline_discussions
+@require_http_methods(("GET", "PATCH"))
+@ensure_csrf_cookie
+@expect_json
+@login_required
+def course_discussions_settings_handler(request, course_key_string):
+ """
+ The restful handler for divided discussion setting requests. Requires JSON.
+ This will raise 404 if user is not staff.
+ GET
+ Returns the JSON representation of divided discussion settings for the course.
+ PATCH
+ Updates the divided discussion settings for the course. Returns the JSON representation of updated settings.
+ """
+ course_key = CourseKey.from_string(course_key_string)
+ course = get_course_with_access(request.user, 'staff', course_key)
+ discussion_settings = get_course_discussion_settings(course_key)
+
+ if request.method == 'PATCH':
+ divided_course_wide_discussions, divided_inline_discussions = get_divided_discussions(
+ course, discussion_settings
+ )
+
+ settings_to_change = {}
+
+ if 'divided_course_wide_discussions' in request.json or 'divided_inline_discussions' in request.json:
+ divided_course_wide_discussions = request.json.get(
+ 'divided_course_wide_discussions', divided_course_wide_discussions
+ )
+ divided_inline_discussions = request.json.get(
+ 'divided_inline_discussions', divided_inline_discussions
+ )
+ settings_to_change['divided_discussions'] = divided_course_wide_discussions + divided_inline_discussions
+
+ if 'always_divide_inline_discussions' in request.json:
+ settings_to_change['always_divide_inline_discussions'] = request.json.get(
+ 'always_divide_inline_discussions'
+ )
+
+ if not settings_to_change:
+ return JsonResponse({"error": unicode("Bad Request")}, 400)
+
+ try:
+ if settings_to_change:
+ discussion_settings = set_course_discussion_settings(course_key, **settings_to_change)
+
+ except ValueError as err:
+ # Note: error message not translated because it is not exposed to the user (UI prevents this state).
+ return JsonResponse({"error": unicode(err)}, 400)
+
+ return JsonResponse(_get_course_discussion_settings_representation(
+ course,
+ discussion_settings
+ ))
+
+
@require_http_methods(("GET", "PATCH"))
@ensure_csrf_cookie
@expect_json
@@ -131,51 +195,27 @@ def course_cohort_settings_handler(request, course_key_string):
Updates the cohort settings for the course. Returns the JSON representation of updated settings.
"""
course_key = CourseKey.from_string(course_key_string)
+ # Although this course data is not used this method will return 404 is user is not staff
course = get_course_with_access(request.user, 'staff', course_key)
- is_cohorted = cohorts.is_course_cohorted(course_key)
- discussion_settings = get_course_discussion_settings(course_key)
if request.method == 'PATCH':
- divided_course_wide_discussions, divided_inline_discussions = get_divided_discussions(
- course, discussion_settings
- )
-
- settings_to_change = {}
-
- if 'is_cohorted' in request.json:
- settings_to_change['is_cohorted'] = request.json.get('is_cohorted')
-
- if 'cohorted_course_wide_discussions' in request.json or 'cohorted_inline_discussions' in request.json:
- divided_course_wide_discussions = request.json.get(
- 'cohorted_course_wide_discussions', divided_course_wide_discussions
- )
- divided_inline_discussions = request.json.get(
- 'cohorted_inline_discussions', divided_inline_discussions
- )
- settings_to_change['divided_discussions'] = divided_course_wide_discussions + divided_inline_discussions
-
- if 'always_cohort_inline_discussions' in request.json:
- settings_to_change['always_divide_inline_discussions'] = request.json.get(
- 'always_cohort_inline_discussions'
- )
-
- if not settings_to_change:
+ if 'is_cohorted' not in request.json:
return JsonResponse({"error": unicode("Bad Request")}, 400)
+ is_cohorted = request.json.get('is_cohorted')
try:
- if 'is_cohorted' in settings_to_change:
- is_cohorted = settings_to_change['is_cohorted']
- cohorts.set_course_cohorted(course_key, is_cohorted)
- del settings_to_change['is_cohorted']
- settings_to_change['division_scheme'] = CourseDiscussionSettings.COHORT if is_cohorted \
- else CourseDiscussionSettings.NONE
- if settings_to_change:
- discussion_settings = set_course_discussion_settings(course_key, **settings_to_change)
+ cohorts.set_course_cohorted(course_key, is_cohorted)
+ scheme = CourseDiscussionSettings.COHORT if is_cohorted else CourseDiscussionSettings.NONE
+ scheme_settings = {'division_scheme': scheme}
+ set_course_discussion_settings(course_key, **scheme_settings)
except ValueError as err:
# Note: error message not translated because it is not exposed to the user (UI prevents this state).
return JsonResponse({"error": unicode(err)}, 400)
- return JsonResponse(_get_course_cohort_settings_representation(course, is_cohorted, discussion_settings))
+ return JsonResponse(_get_course_cohort_settings_representation(
+ cohorts.get_course_cohort_id(course_key),
+ cohorts.is_course_cohorted(course_key)
+ ))
@require_http_methods(("GET", "PUT", "POST", "PATCH"))
@@ -428,9 +468,9 @@ def debug_cohort_mgmt(request, course_key_string):
@expect_json
@login_required
-def cohort_discussion_topics(request, course_key_string):
+def discussion_topics(request, course_key_string):
"""
- The handler for cohort discussion categories requests.
+ The handler for divided discussion categories requests.
This will raise 404 if user is not staff.
Returns the JSON representation of discussion topics w.r.t categories for the course.