Skip to content

fix: remove settings that are duplicated in Pages & Resources #37759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marslanabdulrauf wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −80
Open

fix: remove settings that are duplicated in Pages & Resources #37759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3e79dd
fix: remove settings that are duplicated in Pages & Resources
marslanabdulrauf Dec 15, 2025
a8b0a76
test: remove edxnotes related tests in course_settings tests
marslanabdulrauf Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cms/djangoapps/contentstore/rest_api/v0/views/advanced_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def patch(self, request: Request, course_id: str):
"lti_consumer"
]
},
"show_calculator": {
"course_survey_required": {
"value": true
}
}
Expand Down
75 changes: 0 additions & 75 deletions cms/djangoapps/contentstore/tests/test_course_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1230,80 +1230,6 @@ def test_update_from_json_filtered_off(self):
)
self.assertNotIn('giturl', test_model)

@patch.dict(settings.FEATURES, {'ENABLE_EDXNOTES': True})
def test_edxnotes_present(self):
"""
If feature flag ENABLE_EDXNOTES is on, show the setting as a non-deprecated Advanced Setting.
"""
test_model = CourseMetadata.fetch(self.fullcourse)
self.assertIn('edxnotes', test_model)

@patch.dict(settings.FEATURES, {'ENABLE_EDXNOTES': False})
def test_edxnotes_not_present(self):
"""
If feature flag ENABLE_EDXNOTES is off, don't show the setting at all on the Advanced Settings page.
"""
test_model = CourseMetadata.fetch(self.fullcourse)
self.assertNotIn('edxnotes', test_model)

@patch.dict(settings.FEATURES, {'ENABLE_EDXNOTES': False})
def test_validate_update_filtered_edxnotes_off(self):
"""
If feature flag is off, then edxnotes must be filtered.
"""
# pylint: disable=unused-variable
is_valid, errors, test_model = CourseMetadata.validate_and_update_from_json(
self.course,
{
"edxnotes": {"value": "true"},
},
user=self.user
)
self.assertNotIn('edxnotes', test_model)

@patch.dict(settings.FEATURES, {'ENABLE_EDXNOTES': True})
def test_validate_update_filtered_edxnotes_on(self):
"""
If feature flag is on, then edxnotes must not be filtered.
"""
# pylint: disable=unused-variable
is_valid, errors, test_model = CourseMetadata.validate_and_update_from_json(
self.course,
{
"edxnotes": {"value": "true"},
},
user=self.user
)
self.assertIn('edxnotes', test_model)

@patch.dict(settings.FEATURES, {'ENABLE_EDXNOTES': True})
def test_update_from_json_filtered_edxnotes_on(self):
"""
If feature flag is on, then edxnotes must be updated.
"""
test_model = CourseMetadata.update_from_json(
self.course,
{
"edxnotes": {"value": "true"},
},
user=self.user
)
self.assertIn('edxnotes', test_model)

@patch.dict(settings.FEATURES, {'ENABLE_EDXNOTES': False})
def test_update_from_json_filtered_edxnotes_off(self):
"""
If feature flag is off, then edxnotes must not be updated.
"""
test_model = CourseMetadata.update_from_json(
self.course,
{
"edxnotes": {"value": "true"},
},
user=self.user
)
self.assertNotIn('edxnotes', test_model)

@patch.dict(settings.FEATURES, {'ENABLE_OTHER_COURSE_SETTINGS': True})
def test_othercoursesettings_present(self):
"""
Expand Down Expand Up @@ -1466,7 +1392,6 @@ def test_http_update_from_json(self):
self.assertIn('advertised_start', test_model, 'Missing revised advertised_start metadata field')
self.assertEqual(test_model['advertised_start']['value'], 'start B', "advertised_start not expected value")

@patch.dict(settings.FEATURES, {'ENABLE_EDXNOTES': True})
@patch('xmodule.util.xmodule_django.get_current_request')
def test_post_settings_with_staff_not_enrolled(self, mock_request):
"""
Expand Down
8 changes: 4 additions & 4 deletions cms/djangoapps/models/settings/course_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ class CourseMetadata:
"upstream_version",
"upstream_version_declined",
"upstream_display_name",

# Settings that are being handled through course plugin (Pages & Resources)
"edxnotes",
"show_calculator",
]

@classmethod
Expand All @@ -102,10 +106,6 @@ def get_exclude_list_of_fields(cls, course_key):
if not toggles.EXPORT_GIT.is_enabled():
exclude_list.append('giturl')

# Do not show edxnotes if the feature is disabled.
if not settings.FEATURES.get('ENABLE_EDXNOTES'):
exclude_list.append('edxnotes')

# Do not show video auto advance if the feature is disabled
if not settings.FEATURES.get('ENABLE_OTHER_COURSE_SETTINGS'):
exclude_list.append('other_course_settings')
Expand Down
Loading