diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py b/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py index 0b65389596ae..feec2606205e 100644 --- a/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py +++ b/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py @@ -34,8 +34,10 @@ class CourseSettingsSerializer(serializers.Serializer): is_prerequisite_courses_enabled = serializers.BooleanField() language_options = serializers.ListField(child=serializers.ListField(child=serializers.CharField())) lms_link_for_about_page = serializers.URLField() + licensing_enabled = serializers.BooleanField() marketing_enabled = serializers.BooleanField() mfe_proctored_exam_settings_url = serializers.CharField(required=False, allow_null=True, allow_blank=True) + platform_name = serializers.CharField() possible_pre_requisite_courses = PossiblePreRequisiteCourseSerializer(required=False, many=True) short_description_editable = serializers.BooleanField() show_min_grade_warning = serializers.BooleanField() diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/settings.py b/cms/djangoapps/contentstore/rest_api/v1/views/settings.py index e42b7d85daf7..e921ac60398b 100644 --- a/cms/djangoapps/contentstore/rest_api/v1/views/settings.py +++ b/cms/djangoapps/contentstore/rest_api/v1/views/settings.py @@ -74,9 +74,11 @@ def get(self, request: Request, course_id: str): ], ... ], + "licensing_enabled": false, "lms_link_for_about_page": "http://localhost:18000/courses/course-v1:edX+E2E-101+course/about", "marketing_enabled": true, "mfe_proctored_exam_settings_url": "", + "platform_name": "edX", "possible_pre_requisite_courses": [ { "course_key": "course-v1:edX+M12+2T2023", @@ -108,6 +110,8 @@ def get(self, request: Request, course_id: str): 'can_show_certificate_available_date_field': can_show_certificate_available_date_field(course_block), 'course_display_name': course_block.display_name, 'course_display_name_with_default': course_block.display_name_with_default, + 'platform_name': settings.PLATFORM_NAME, + 'licensing_enabled': settings.FEATURES.get("LICENSING", False), 'use_v2_cert_display_settings': settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS", False), }) diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_settings.py b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_settings.py index 4831ad4899a8..2c867ad0947c 100644 --- a/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_settings.py +++ b/cms/djangoapps/contentstore/rest_api/v1/views/tests/test_settings.py @@ -48,10 +48,12 @@ def test_course_settings_response(self): "mfe_proctored_exam_settings_url": get_proctored_exam_settings_url( self.course.id ), + "platform_name": settings.PLATFORM_NAME, "short_description_editable": True, "sidebar_html_enabled": False, "show_min_grade_warning": False, "upgrade_deadline": None, + "licensing_enabled": False, "use_v2_cert_display_settings": False, } diff --git a/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py b/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py index b2b96e24277b..e26242f81f16 100644 --- a/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py +++ b/cms/djangoapps/contentstore/xblock_storage_handlers/view_handlers.py @@ -882,7 +882,6 @@ def _duplicate_block( @login_required -@expect_json def delete_item(request, usage_key): """ Exposes internal helper method without breaking existing bindings/dependencies diff --git a/common/test/data/course_after_rename/about/overview.html b/common/test/data/course_after_rename/about/overview.html index 5bdbd4428f88..0f9a54de9a4a 100644 --- a/common/test/data/course_after_rename/about/overview.html +++ b/common/test/data/course_after_rename/about/overview.html @@ -14,7 +14,7 @@

Requirements

Course Staff

- Course Staff Image #1 + Course Staff Image #1

Staff Member #1

@@ -23,7 +23,7 @@

Staff Member #1

- Course Staff Image #2 + Course Staff Image #2

Staff Member #2

diff --git a/common/test/data/course_before_rename/about/overview.html b/common/test/data/course_before_rename/about/overview.html index 5bdbd4428f88..0f9a54de9a4a 100644 --- a/common/test/data/course_before_rename/about/overview.html +++ b/common/test/data/course_before_rename/about/overview.html @@ -14,7 +14,7 @@

Requirements

Course Staff

- Course Staff Image #1 + Course Staff Image #1

Staff Member #1

@@ -23,7 +23,7 @@

Staff Member #1

- Course Staff Image #2 + Course Staff Image #2

Staff Member #2

diff --git a/common/test/data/course_info_updates/about/overview.html b/common/test/data/course_info_updates/about/overview.html index f5ed206b16fc..6b4fe1a8636d 100644 --- a/common/test/data/course_info_updates/about/overview.html +++ b/common/test/data/course_info_updates/about/overview.html @@ -14,7 +14,7 @@

Prerequisites

Course Staff

- Course Staff Image #1 + Course Staff Image #1

Staff Member #1

@@ -23,7 +23,7 @@

Staff Member #1

- Course Staff Image #2 + Course Staff Image #2

Staff Member #2

diff --git a/common/test/data/manual-testing-complete/about/overview.html b/common/test/data/manual-testing-complete/about/overview.html index f5ed206b16fc..6b4fe1a8636d 100644 --- a/common/test/data/manual-testing-complete/about/overview.html +++ b/common/test/data/manual-testing-complete/about/overview.html @@ -14,7 +14,7 @@

Prerequisites

Course Staff

- Course Staff Image #1 + Course Staff Image #1

Staff Member #1

@@ -23,7 +23,7 @@

Staff Member #1

- Course Staff Image #2 + Course Staff Image #2

Staff Member #2

diff --git a/common/test/data/scoreable/about/overview.html b/common/test/data/scoreable/about/overview.html index 0732bc5db2e8..f829d3c8c177 100644 --- a/common/test/data/scoreable/about/overview.html +++ b/common/test/data/scoreable/about/overview.html @@ -14,7 +14,7 @@

Requirements

Course Staff

- Course Staff Image #1 + Course Staff Image #1

Staff Member #1

@@ -23,7 +23,7 @@

Staff Member #1

- Course Staff Image #2 + Course Staff Image #2

Staff Member #2

diff --git a/xmodule/templates/about/overview.yaml b/xmodule/templates/about/overview.yaml index 728222b174ea..29ed75b96339 100644 --- a/xmodule/templates/about/overview.yaml +++ b/xmodule/templates/about/overview.yaml @@ -19,7 +19,7 @@ data: |

Course Staff

- Course Staff Image #1 + Course Staff Image #1

Staff Member #1

@@ -28,7 +28,7 @@ data: |
- Course Staff Image #2 + Course Staff Image #2

Staff Member #2