revert: Removing the details_settings API

This reverts commit 8940cb3
since it will be replaced with a new commit from upstream.

cms/djangoapps/contentstore/rest_api/v0/urls.py

@@ -3,13 +3,7 @@
 from django.urls import re_path
 
 from openedx.core.constants import COURSE_ID_PATTERN
-from .views import (
-    AdvancedCourseSettingsView,
-    CourseDetailsSettingsView,
-    CourseTabSettingsView,
-    CourseTabListView,
-    CourseTabReorderView
-)
+from .views import AdvancedCourseSettingsView, CourseTabSettingsView, CourseTabListView, CourseTabReorderView
 
 app_name = "v0"
 
@@ -34,9 +28,4 @@
         CourseTabReorderView.as_view(),
         name="course_tab_reorder",
     ),
-    re_path(
-        fr"^details_settings/{COURSE_ID_PATTERN}$",
-        CourseDetailsSettingsView.as_view(),
-        name="course_details_settings",
-    ),
 ]

cms/djangoapps/contentstore/rest_api/v0/views/__init__.py

@@ -2,5 +2,4 @@
 Views for v0 contentstore API.
 """
 from .advanced_settings import AdvancedCourseSettingsView
-from .details_settings import CourseDetailsSettingsView
 from .tabs import CourseTabSettingsView, CourseTabListView, CourseTabReorderView

cms/djangoapps/contentstore/views/course.py

@@ -1275,70 +1275,63 @@ def settings_handler(request, course_key_string):  # lint-amnesty, pylint: disab
                 )
             # For every other possible method type submitted by the caller...
             else:
-                return update_course_details_settings(course_key, course_block, request)
-
-
-def update_course_details_settings(course_key, course_block: CourseBlock, request):
-    """
-    Helper function to update course details settings from API data
-    """
-    # if pre-requisite course feature is enabled set pre-requisite course
-    if is_prerequisite_courses_enabled():
-        prerequisite_course_keys = request.json.get('pre_requisite_courses', [])
-        if prerequisite_course_keys:
-            if not all(is_valid_course_key(course_key) for course_key in prerequisite_course_keys):
-                return JsonResponseBadRequest({"error": _("Invalid prerequisite course key")})
-            set_prerequisite_courses(course_key, prerequisite_course_keys)
-        else:
-            # None is chosen, so remove the course prerequisites
-            course_milestones = milestones_api.get_course_milestones(
-                course_key=course_key,
-                relationship="requires",
-            )
-            for milestone in course_milestones:
-                entrance_exam_namespace = generate_milestone_namespace(
-                    get_namespace_choices().get('ENTRANCE_EXAM'),
-                    course_key
+                # if pre-requisite course feature is enabled set pre-requisite course
+                if is_prerequisite_courses_enabled():
+                    prerequisite_course_keys = request.json.get('pre_requisite_courses', [])
+                    if prerequisite_course_keys:
+                        if not all(is_valid_course_key(course_key) for course_key in prerequisite_course_keys):
+                            return JsonResponseBadRequest({"error": _("Invalid prerequisite course key")})
+                        set_prerequisite_courses(course_key, prerequisite_course_keys)
+                    else:
+                        # None is chosen, so remove the course prerequisites
+                        course_milestones = milestones_api.get_course_milestones(
+                            course_key=course_key,
+                            relationship="requires",
+                        )
+                        for milestone in course_milestones:
+                            entrance_exam_namespace = generate_milestone_namespace(
+                                get_namespace_choices().get('ENTRANCE_EXAM'),
+                                course_key
+                            )
+                            if milestone["namespace"] != entrance_exam_namespace:
+                                remove_prerequisite_course(course_key, milestone)
+
+                # If the entrance exams feature has been enabled, we'll need to check for some
+                # feature-specific settings and handle them accordingly
+                # We have to be careful that we're only executing the following logic if we actually
+                # need to create or delete an entrance exam from the specified course
+                if core_toggles.ENTRANCE_EXAMS.is_enabled():
+                    course_entrance_exam_present = course_block.entrance_exam_enabled
+                    entrance_exam_enabled = request.json.get('entrance_exam_enabled', '') == 'true'
+                    ee_min_score_pct = request.json.get('entrance_exam_minimum_score_pct', None)
+                    # If the entrance exam box on the settings screen has been checked...
+                    if entrance_exam_enabled:
+                        # Load the default minimum score threshold from settings, then try to override it
+                        entrance_exam_minimum_score_pct = float(settings.ENTRANCE_EXAM_MIN_SCORE_PCT)
+                        if ee_min_score_pct:
+                            entrance_exam_minimum_score_pct = float(ee_min_score_pct)
+                        if entrance_exam_minimum_score_pct.is_integer():
+                            entrance_exam_minimum_score_pct = entrance_exam_minimum_score_pct / 100
+                        # If there's already an entrance exam defined, we'll update the existing one
+                        if course_entrance_exam_present:
+                            exam_data = {
+                                'entrance_exam_minimum_score_pct': entrance_exam_minimum_score_pct
+                            }
+                            update_entrance_exam(request, course_key, exam_data)
+                        # If there's no entrance exam defined, we'll create a new one
+                        else:
+                            create_entrance_exam(request, course_key, entrance_exam_minimum_score_pct)
+
+                    # If the entrance exam box on the settings screen has been unchecked,
+                    # and the course has an entrance exam attached...
+                    elif not entrance_exam_enabled and course_entrance_exam_present:
+                        delete_entrance_exam(request, course_key)
+
+                # Perform the normal update workflow for the CourseDetails model
+                return JsonResponse(
+                    CourseDetails.update_from_json(course_key, request.json, request.user),
+                    encoder=CourseSettingsEncoder
                 )
-                if milestone["namespace"] != entrance_exam_namespace:
-                    remove_prerequisite_course(course_key, milestone)
-
-    # If the entrance exams feature has been enabled, we'll need to check for some
-    # feature-specific settings and handle them accordingly
-    # We have to be careful that we're only executing the following logic if we actually
-    # need to create or delete an entrance exam from the specified course
-    if core_toggles.ENTRANCE_EXAMS.is_enabled():
-        course_entrance_exam_present = course_block.entrance_exam_enabled
-        entrance_exam_enabled = request.json.get('entrance_exam_enabled', '') == 'true'
-        ee_min_score_pct = request.json.get('entrance_exam_minimum_score_pct', None)
-        # If the entrance exam box on the settings screen has been checked...
-        if entrance_exam_enabled:
-            # Load the default minimum score threshold from settings, then try to override it
-            entrance_exam_minimum_score_pct = float(settings.ENTRANCE_EXAM_MIN_SCORE_PCT)
-            if ee_min_score_pct:
-                entrance_exam_minimum_score_pct = float(ee_min_score_pct)
-            if entrance_exam_minimum_score_pct.is_integer():
-                entrance_exam_minimum_score_pct = entrance_exam_minimum_score_pct / 100
-            # If there's already an entrance exam defined, we'll update the existing one
-            if course_entrance_exam_present:
-                exam_data = {
-                    'entrance_exam_minimum_score_pct': entrance_exam_minimum_score_pct
-                }
-                update_entrance_exam(request, course_key, exam_data)
-            # If there's no entrance exam defined, we'll create a new one
-            else:
-                create_entrance_exam(request, course_key, entrance_exam_minimum_score_pct)
-
-        # If the entrance exam box on the settings screen has been unchecked,
-        # and the course has an entrance exam attached...
-        elif not entrance_exam_enabled and course_entrance_exam_present:
-            delete_entrance_exam(request, course_key)
-
-    # Perform the normal update workflow for the CourseDetails model
-    return JsonResponse(
-        CourseDetails.update_from_json(course_key, request.json, request.user),
-        encoder=CourseSettingsEncoder
-    )
 
 
 @login_required

common/djangoapps/util/json_request.py

@@ -8,8 +8,6 @@
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db.models.query import QuerySet
 from django.http import HttpResponse, HttpResponseBadRequest
-from django.utils.decorators import method_decorator
-from django.views import View
 
 
 class EDXJSONEncoder(DjangoJSONEncoder):
@@ -42,6 +40,7 @@ def expect_json(view_function):
     CONTENT_TYPE is application/json, parses the json dict from request.body, and updates
     request.POST with the contents.
     """
+    @wraps(view_function)
     def parse_json_into_request(request, *args, **kwargs):
         # cdodge: fix postback errors in CMS. The POST 'content-type' header can include additional information
         # e.g. 'charset', so we can't do a direct string compare
@@ -55,14 +54,7 @@ def parse_json_into_request(request, *args, **kwargs):
 
         return view_function(request, *args, **kwargs)
 
-    if isinstance(view_function, type) and issubclass(view_function, View):
-        view_function.dispatch = method_decorator(expect_json)(view_function.dispatch)
-        return view_function
-    else:
-        @wraps(view_function)
-        def wrapper(request, *args, **kwargs):
-            return parse_json_into_request(request, *args, **kwargs)
-        return wrapper
+    return parse_json_into_request
 
 
 class JsonResponse(HttpResponse):