From 7986be68a40312087d9de7ba94c266c447a44f19 Mon Sep 17 00:00:00 2001
From: ruzniaievdm <ruzniaievdm@gmail.com>
Date: Tue, 13 Jun 2023 17:17:20 +0300
Subject: [PATCH 1/4] fix: add PLATFORM_NAME to course settings endpoint

---
 cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py | 1 +
 cms/djangoapps/contentstore/rest_api/v1/views/settings.py       | 2 ++
 .../contentstore/rest_api/v1/views/tests/test_settings.py       | 1 +
 3 files changed, 4 insertions(+)

diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py b/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py
index 0b65389596ae..716aa850c2c5 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py
@@ -36,6 +36,7 @@ class CourseSettingsSerializer(serializers.Serializer):
     lms_link_for_about_page = serializers.URLField()
     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..a8f1ec0613be 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/settings.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/settings.py
@@ -77,6 +77,7 @@ def get(self, request: Request, course_id: str):
             "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 +109,7 @@ 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,
                 '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..ef79eabf6c62 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,6 +48,7 @@ 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,

From cc47cd30a9e9428bc822804797c41b5ad003bfd3 Mon Sep 17 00:00:00 2001
From: ruzniaievdm <ruzniaievdm@gmail.com>
Date: Wed, 5 Jul 2023 20:00:51 +0300
Subject: [PATCH 2/4] fix: add feature LICENSING to course settings drf

---
 cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py | 1 +
 cms/djangoapps/contentstore/rest_api/v1/views/settings.py       | 2 ++
 .../contentstore/rest_api/v1/views/tests/test_settings.py       | 1 +
 3 files changed, 4 insertions(+)

diff --git a/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py b/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py
index 716aa850c2c5..feec2606205e 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/serializers/settings.py
@@ -34,6 +34,7 @@ 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()
diff --git a/cms/djangoapps/contentstore/rest_api/v1/views/settings.py b/cms/djangoapps/contentstore/rest_api/v1/views/settings.py
index a8f1ec0613be..e921ac60398b 100644
--- a/cms/djangoapps/contentstore/rest_api/v1/views/settings.py
+++ b/cms/djangoapps/contentstore/rest_api/v1/views/settings.py
@@ -74,6 +74,7 @@ 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": "",
@@ -110,6 +111,7 @@ def get(self, request: Request, course_id: str):
                 '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 ef79eabf6c62..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
@@ -53,6 +53,7 @@ def test_course_settings_response(self):
             "sidebar_html_enabled": False,
             "show_min_grade_warning": False,
             "upgrade_deadline": None,
+            "licensing_enabled": False,
             "use_v2_cert_display_settings": False,
         }
 

From 356c2313f7399e998b0d8ffd79e8ab2ab39b74c7 Mon Sep 17 00:00:00 2001
From: ruzniaievdm <ruzniaievdm@gmail.com>
Date: Wed, 19 Jul 2023 20:27:40 +0300
Subject: [PATCH 3/4] fix: error occurs when a user disables the Entrance exam

---
 .../contentstore/xblock_storage_handlers/view_handlers.py        | 1 -
 1 file changed, 1 deletion(-)

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

From b21f2835d3e9e52bbea55f8e1c827c3432cdf6b4 Mon Sep 17 00:00:00 2001
From: ruzniaievdm <ruzniaievdm@gmail.com>
Date: Tue, 25 Jul 2023 20:22:47 +0300
Subject: [PATCH 4/4] fix: Change syntax for overview.html

---
 common/test/data/course_after_rename/about/overview.html     | 4 ++--
 common/test/data/course_before_rename/about/overview.html    | 4 ++--
 common/test/data/course_info_updates/about/overview.html     | 4 ++--
 common/test/data/manual-testing-complete/about/overview.html | 4 ++--
 common/test/data/scoreable/about/overview.html               | 4 ++--
 xmodule/templates/about/overview.yaml                        | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

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 @@ <h2>Requirements</h2>
   <h2>Course Staff</h2>
   <article class="teacher">
     <div class="teacher-image">
-      <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #1">
+      <img src="/static/images/placeholder-faculty.png" align="left" style="margin: 0 20px 0;" alt="Course Staff Image #1" />
     </div>
 
     <h3>Staff Member #1</h3>
@@ -23,7 +23,7 @@ <h3>Staff Member #1</h3>
 
   <article class="teacher">
     <div class="teacher-image">
-      <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #2">
+      <img src="/static/images/placeholder-faculty.png" align="left" style="margin: 0 20px 0;" alt="Course Staff Image #2" />
     </div>
 
     <h3>Staff Member #2</h3>
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 @@ <h2>Requirements</h2>
   <h2>Course Staff</h2>
   <article class="teacher">
     <div class="teacher-image">
-      <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #1">
+      <img src="/static/images/placeholder-faculty.png" align="left" style="margin: 0 20px 0;" alt="Course Staff Image #1" />
     </div>
 
     <h3>Staff Member #1</h3>
@@ -23,7 +23,7 @@ <h3>Staff Member #1</h3>
 
   <article class="teacher">
     <div class="teacher-image">
-      <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #2">
+      <img src="/static/images/placeholder-faculty.png" align="left" style="margin: 0 20px 0;" alt="Course Staff Image #2" />
     </div>
 
     <h3>Staff Member #2</h3>
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 @@ <h2>Prerequisites</h2>
   <h2>Course Staff</h2>
   <article class="teacher">
     <div class="teacher-image">
-      <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #1">
+      <img src="/static/images/placeholder-faculty.png" align="left" style="margin: 0 20px 0;" alt="Course Staff Image #1" />
     </div>
 
     <h3>Staff Member #1</h3>
@@ -23,7 +23,7 @@ <h3>Staff Member #1</h3>
 
   <article class="teacher">
     <div class="teacher-image">
-      <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #2">
+      <img src="/static/images/placeholder-faculty.png" align="left" style="margin: 0 20px 0;" alt="Course Staff Image #2" />
     </div>
 
     <h3>Staff Member #2</h3>
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 @@ <h2>Prerequisites</h2>
   <h2>Course Staff</h2>
   <article class="teacher">
     <div class="teacher-image">
-      <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #1">
+      <img src="/static/images/placeholder-faculty.png" align="left" style="margin: 0 20px 0;" alt="Course Staff Image #1" />
     </div>
 
     <h3>Staff Member #1</h3>
@@ -23,7 +23,7 @@ <h3>Staff Member #1</h3>
 
   <article class="teacher">
     <div class="teacher-image">
-      <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #2">
+      <img src="/static/images/placeholder-faculty.png" align="left" style="margin: 0 20px 0;" alt="Course Staff Image #2" />
     </div>
 
     <h3>Staff Member #2</h3>
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 @@ <h2>Requirements</h2>
   <h2>Course Staff</h2>
   <article class="teacher">
     <div class="teacher-image">
-      <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #1">
+      <img src="/static/images/placeholder-faculty.png" align="left" style="margin: 0 20px 0;" alt="Course Staff Image #1" />
     </div>
 
     <h3>Staff Member #1</h3>
@@ -23,7 +23,7 @@ <h3>Staff Member #1</h3>
 
   <article class="teacher">
     <div class="teacher-image">
-      <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #2">
+      <img src="/static/images/placeholder-faculty.png" align="left" style="margin: 0 20px 0;" alt="Course Staff Image #2" />
     </div>
 
     <h3>Staff Member #2</h3>
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: |
       <h2>Course Staff</h2>
       <article class="teacher">
         <div class="teacher-image">
-          <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #1">
+          <img src="/static/images/placeholder-faculty.png" align="left" style="margin: 0 20px 0;" alt="Course Staff Image #1" />
         </div>
 
         <h3>Staff Member #1</h3>
@@ -28,7 +28,7 @@ data: |
 
       <article class="teacher">
         <div class="teacher-image">
-          <img src="/static/images/placeholder-faculty.png" align="left" style="margin:0 20 px 0" alt="Course Staff Image #2">
+          <img src="/static/images/placeholder-faculty.png" align="left" style="margin: 0 20px 0;" alt="Course Staff Image #2" />
         </div>
 
         <h3>Staff Member #2</h3>