From e07f45b5dd050c201cadba336f9710bf6eb1530c Mon Sep 17 00:00:00 2001 From: Usman Khalid <2200617@gmail.com> Date: Mon, 2 Mar 2015 16:32:28 +0500 Subject: [PATCH] Removed cohort_config from advanced settings page. TNL-1258 --- cms/djangoapps/models/settings/course_metadata.py | 1 + common/test/acceptance/pages/studio/settings_advanced.py | 1 - lms/djangoapps/django_comment_client/utils.py | 3 +-- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cms/djangoapps/models/settings/course_metadata.py b/cms/djangoapps/models/settings/course_metadata.py index 87d941632e..6f81d9de77 100644 --- a/cms/djangoapps/models/settings/course_metadata.py +++ b/cms/djangoapps/models/settings/course_metadata.py @@ -18,6 +18,7 @@ class CourseMetadata(object): # Should not be used directly. Instead the filtered_list method should # be used if the field needs to be filtered depending on the feature flag. FILTERED_LIST = [ + 'cohort_config', 'xml_attributes', 'start', 'end', diff --git a/common/test/acceptance/pages/studio/settings_advanced.py b/common/test/acceptance/pages/studio/settings_advanced.py index 126971bcd7..d556e4b72c 100644 --- a/common/test/acceptance/pages/studio/settings_advanced.py +++ b/common/test/acceptance/pages/studio/settings_advanced.py @@ -154,7 +154,6 @@ class AdvancedSettingsPage(CoursePage): 'cert_name_long', 'cert_name_short', 'certificates_display_behavior', - 'cohort_config', 'course_image', 'cosmetic_display_price', 'advertised_start', diff --git a/lms/djangoapps/django_comment_client/utils.py b/lms/djangoapps/django_comment_client/utils.py index 4c649f8a6a..3aa99ecc15 100644 --- a/lms/djangoapps/django_comment_client/utils.py +++ b/lms/djangoapps/django_comment_client/utils.py @@ -405,7 +405,7 @@ def add_courseware_context(content_list, course, user, id_map=None): content.update({"courseware_url": url, "courseware_title": title}) -def prepare_content(content, course_key, is_staff=False, **kwargs): +def prepare_content(content, course_key, is_staff=False, course_is_cohorted=None): """ This function is used to pre-process thread and comment models in various ways before adding them to the HTTP response. This includes fixing empty @@ -459,7 +459,6 @@ def prepare_content(content, course_key, is_staff=False, **kwargs): else: del endorsement["user_id"] - course_is_cohorted = kwargs.get('course_is_cohorted') if course_is_cohorted is None: course_is_cohorted = is_course_cohorted(course_key)