diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py index 2fba1dbade..8418535e81 100644 --- a/cms/djangoapps/contentstore/views/course.py +++ b/cms/djangoapps/contentstore/views/course.py @@ -53,6 +53,7 @@ delete_entrance_exam, update_entrance_exam, ) +from milestones import api as milestones_api from course_action_state.managers import CourseActionStateItemNotFoundError from course_action_state.models import CourseRerunState, CourseRerunUIStateManager from course_creators.views import get_course_creator_status, add_user_with_status_unrequested @@ -83,6 +84,7 @@ is_prerequisite_courses_enabled, is_valid_course_key, set_prerequisite_courses, + remove_prerequisite_course, ) from util.organizations_helpers import ( add_organization_course, @@ -1023,6 +1025,11 @@ def settings_handler(request, course_key_string): 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 chose so remove the course prerequites + course_milestones = milestones_api.get_course_milestones(course_key=course_key, relationship="requires") + for milestone in course_milestones: + 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 diff --git a/common/djangoapps/util/milestones_helpers.py b/common/djangoapps/util/milestones_helpers.py index e2cc255552..dc4a03137a 100644 --- a/common/djangoapps/util/milestones_helpers.py +++ b/common/djangoapps/util/milestones_helpers.py @@ -376,9 +376,13 @@ def any_unfulfilled_milestones(course_id, user_id): """ Returns a boolean if user has any unfulfilled milestones """ if not settings.FEATURES.get('MILESTONES_APP', False): return False - return bool( - get_course_milestones_fulfillment_paths(course_id, {"id": user_id}) - ) + + from milestones import api as milestones_api + fulfillment_paths = milestones_api.get_course_milestones_fulfillment_paths(course_id, {'id': user_id}) + + # Returns True if any of the milestones is unfulfilled. False if + # values is empty or all values are. + return any(fulfillment_paths.values()) def get_course_milestones_fulfillment_paths(course_id, user_id):