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

Supply default url for XQA server

Browse Source
This commit is contained in:
Sarina Canelake
2015-04-28 13:51:03 -04:00
parent 1ca4b3b941
commit c7424dd7ae
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/djangoapps/courseware/views.py
View File

@@ -421,7 +421,7 @@ def _index_bulk_op(request, course_key, chapter, section, position):
'staff_access': staff_access,
'studio_url': studio_url,
'masquerade': masquerade,
'xqa_server': settings.FEATURES.get('USE_XQA_SERVER', 'http://xqa:server@content-qa.mitx.mit.edu/xqa'),
'xqa_server': settings.FEATURES.get('XQA_SERVER', "http://your_xqa_server.com"),
'reverifications': fetch_reverify_banner_info(request, course_key),
}

2
lms/djangoapps/lti_provider/tests/test_views.py
View File

@@ -278,7 +278,7 @@ class RenderCoursewareTest(TestCase):
'disable_footer': True,
'disable_tabs': True,
'staff_access': 'StaffAccess',
'xqa_server': 'http://example.com/xqa',
'xqa_server': 'http://your_xqa_server.com',
}
request = build_run_request()
views.render_courseware(request, ALL_PARAMS.copy())

2
lms/djangoapps/lti_provider/views.py
View File

@@ -173,7 +173,7 @@ def render_courseware(request, lti_params):
'disable_footer': True,
'disable_tabs': True,
'staff_access': staff,
'xqa_server': settings.FEATURES.get('USE_XQA_SERVER', 'http://example.com/xqa'),
'xqa_server': settings.FEATURES.get('XQA_SERVER', 'http://your_xqa_server.com'),
}
return render_to_response('courseware/courseware.html', context)

2
lms/envs/dev.py
View File

@@ -186,7 +186,7 @@ OPEN_ENDED_GRADING_INTERFACE = {
############################## LMS Migration ##################################
FEATURES['ENABLE_LMS_MIGRATION'] = True
FEATURES['ACCESS_REQUIRE_STAFF_FOR_COURSE'] = False # require that user be in the staff_* group to be able to enroll
FEATURES['USE_XQA_SERVER'] = 'http://xqa:server@content-qa.edX.mit.edu/xqa'
FEATURES['XQA_SERVER'] = 'http://xqa:server@content-qa.edX.mit.edu/xqa'
INSTALLED_APPS += ('lms_migration',)

4
lms/templates/courseware/xqa_interface.html
View File

@@ -51,7 +51,7 @@ function sendlog(element_id, edit_link, staff_context){
$('#' + element_id + '_xqa_log_data').html(result);
},
error: function() {
alert('Error: cannot connect to XQA server. Check the value of the USE_XQA_SERVER feature.');
alert('Error: cannot connect to XQA server. Check the value of the XQA_SERVER setting.');
console.log('error!');
}
});
@@ -78,7 +78,7 @@ function getlog(element_id, staff_context){
$('#' + element_id + '_xqa_log_data').html(result);
},
error: function() {
alert('Error: cannot connect to XQA server. Check the value of the USE_XQA_SERVER feature.');
alert('Error: cannot connect to XQA server. Check the value of the XQA_SERVER setting.');
}
});

2
openedx/core/lib/xblock_utils.py
View File

@@ -299,7 +299,7 @@ def add_staff_markup(user, has_instructor_access, block, view, frag, context):
'element_id': block.location.html_id().replace('-', '_'),
'edit_link': edit_link,
'user': user,
'xqa_server': settings.FEATURES.get('USE_XQA_SERVER', 'http://xqa:server@content-qa.mitx.mit.edu/xqa'),
'xqa_server': settings.FEATURES.get('XQA_SERVER', "http://your_xqa_server.com"),
'histogram': json.dumps(histogram),
'render_histogram': render_histogram,
'block_content': frag.content,