From a47be54050bb710ef414ec7ce22afd3a5af04374 Mon Sep 17 00:00:00 2001 From: cahrens Date: Thu, 14 Jan 2016 13:35:26 -0500 Subject: [PATCH] Un-deprecate teams setting. TNL-3803 --- common/lib/xmodule/xmodule/course_module.py | 12 +++++++++--- .../acceptance/pages/studio/settings_advanced.py | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py index c4a187f670..49d9554927 100644 --- a/common/lib/xmodule/xmodule/course_module.py +++ b/common/lib/xmodule/xmodule/course_module.py @@ -693,11 +693,17 @@ class CourseFields(object): teams_configuration = Dict( display_name=_("Teams Configuration"), help=_( - "Enter configuration for the teams feature. Expects two entries: max_team_size and topics, where " - "topics is a list of topics." + 'Specify the maximum team size and topics for teams inside the provided set of curly braces. ' + 'Make sure that you enclose all of the sets of topic values within a set of square brackets, ' + 'with a comma after the closing curly brace for each topic, and another comma after the ' + 'closing square brackets. ' + 'For example, to specify that teams should have a maximum of 5 participants and provide a list of ' + '2 topics, enter the configuration in this format: ' + '{"topics": [{"name": "Topic1Name", "description": "Topic1Description", "id": "Topic1ID"}, ' + '{"name": "Topic2Name", "description": "Topic2Description", "id": "Topic2ID"}], "max_team_size": 5}. ' + 'In "id" values, the only supported special characters are underscore, hyphen, and period.' ), scope=Scope.settings, - deprecated=True, # Deprecated until the teams feature is made generally available ) enable_proctored_exams = Boolean( diff --git a/common/test/acceptance/pages/studio/settings_advanced.py b/common/test/acceptance/pages/studio/settings_advanced.py index 322e73b073..61f769d11c 100644 --- a/common/test/acceptance/pages/studio/settings_advanced.py +++ b/common/test/acceptance/pages/studio/settings_advanced.py @@ -210,6 +210,7 @@ class AdvancedSettingsPage(CoursePage): 'show_calculator', 'show_reset_button', 'static_asset_path', + 'teams_configuration', 'text_customization', 'annotation_storage_url', 'social_sharing_url',