From e845dda8b0c278f07be64721339aa205aedf3830 Mon Sep 17 00:00:00 2001
From: Andy Armstrong <andya@edx.org>
Date: Thu, 6 Aug 2015 11:56:17 -0400
Subject: [PATCH] Enable teams and deprecate the advanced setting
---
cms/envs/common.py | 2 +-
common/lib/xmodule/xmodule/course_module.py | 3 ++-
common/test/acceptance/pages/studio/settings_advanced.py | 1 -
lms/envs/common.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 3214e7231ae..16884037b63 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -168,7 +168,7 @@ FEATURES = {
},
# Teams feature
- 'ENABLE_TEAMS': False,
+ 'ENABLE_TEAMS': True,
# Show video bumper in Studio
'ENABLE_VIDEO_BUMPER': False,
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index 808279b20e1..b9c4096ed1e 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -904,7 +904,8 @@ class CourseFields(object):
"Enter configuration for the teams feature. Expects two entries: max_team_size and topics, where "
"topics is a list of topics."
),
- scope=Scope.settings
+ 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 3046abe8bc5..c96ce12e7f4 100644
--- a/common/test/acceptance/pages/studio/settings_advanced.py
+++ b/common/test/acceptance/pages/studio/settings_advanced.py
@@ -199,7 +199,6 @@ class AdvancedSettingsPage(CoursePage):
'text_customization',
'annotation_storage_url',
'social_sharing_url',
- 'teams_configuration',
'video_bumper',
'cert_html_view_enabled',
'enable_proctored_exams',
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 2add2dd585b..1e52d20ab70 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -396,7 +396,7 @@ FEATURES = {
'ENABLE_SOFTWARE_SECURE_FAKE': False,
# Teams feature
- 'ENABLE_TEAMS': False,
+ 'ENABLE_TEAMS': True,
# Show video bumper in LMS
'ENABLE_VIDEO_BUMPER': False,
--
GitLab