Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10215 from edx/ziafazal/SOL-1317

Browse Source 
SOL-1317: check MILESTONES_APP also when checking prerequisite courses enabled
This commit is contained in:
Matt Drayer
2015-10-19 09:47:20 -04:00
parent b4ff9f882b 0f637fdc95
commit c30960cc85
6 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cms/djangoapps/contentstore/views/course.py
View File

@@ -87,7 +87,8 @@ from student.auth import has_course_author_access
from util.milestones_helpers import (
set_prerequisite_courses,
is_valid_course_key
is_valid_course_key,
is_prerequisite_courses_enabled
)
log = logging.getLogger(__name__)
@@ -894,7 +895,6 @@ def settings_handler(request, course_key_string):
json: update the Course and About xblocks through the CourseDetails model
"""
course_key = CourseKey.from_string(course_key_string)
prerequisite_course_enabled = settings.FEATURES.get('ENABLE_PREREQUISITE_COURSES', False)
credit_eligibility_enabled = settings.FEATURES.get('ENABLE_CREDIT_ELIGIBILITY', False)
with modulestore().bulk_operations(course_key):
course_module = get_course_and_check_access(course_key, request.user)
@@ -911,7 +911,6 @@ def settings_handler(request, course_key_string):
about_page_editable = not marketing_site_enabled
enrollment_end_editable = GlobalStaff().has_user(request.user) or not marketing_site_enabled
short_description_editable = settings.FEATURES.get('EDITABLE_SHORT_DESCRIPTION', True)
settings_context = {
'context_course': course_module,
@@ -928,8 +927,9 @@ def settings_handler(request, course_key_string):
'is_credit_course': False,
'show_min_grade_warning': False,
'enrollment_end_editable': enrollment_end_editable,
'is_prerequisite_courses_enabled': is_prerequisite_courses_enabled()
}
if prerequisite_course_enabled:
if is_prerequisite_courses_enabled():
courses, in_process_course_actions = get_courses_accessible_to_user(request)
# exclude current course from the list of available courses
courses = [course for course in courses if course.id != course_key]
@@ -970,7 +970,7 @@ def settings_handler(request, course_key_string):
# For every other possible method type submitted by the caller...
else:
# if pre-requisite course feature is enabled set pre-requisite course
if prerequisite_course_enabled:
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):

2
cms/templates/settings.html
View File

@@ -376,7 +376,7 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url}';
<input type="text" class="short time" id="course-effort" placeholder="HH:MM" />
<span class="tip tip-inline">${_("Time spent on all course work")}</span>
</li>
% if settings.FEATURES.get('ENABLE_PREREQUISITE_COURSES'):
% if is_prerequisite_courses_enabled:
<li class="field field-select" id="field-pre-requisite-course">
<label for="pre-requisite-course">${_("Prerequisite Course")}</label>
<select class="input" id="pre-requisite-course">