From 431704ac88dd54e0b72cab426b58f0f54fefabd1 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Mon, 21 May 2012 12:59:38 -0400 Subject: [PATCH] Make courseware work with multicourse disabled --- djangoapps/courseware/module_render.py | 10 ++++++++-- djangoapps/courseware/views.py | 9 +++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/djangoapps/courseware/module_render.py b/djangoapps/courseware/module_render.py index fc7240286f..278d19fd2c 100644 --- a/djangoapps/courseware/module_render.py +++ b/djangoapps/courseware/module_render.py @@ -98,14 +98,20 @@ def render_x_module(user, request, xml_module, module_object_preload): # get coursename if stored coursename = multicourse_settings.get_coursename_from_request(request) - xp = multicourse_settings.get_course_xmlpath(coursename) # path to XML for the course + + if coursename and settings.ENABLE_MULTICOURSE: + xp = multicourse_settings.get_course_xmlpath(coursename) # path to XML for the course + data_root = settings.DATA_DIR + xp + else: + data_root = settings.DATA_DIR # Create a new instance ajax_url = settings.MITX_ROOT_URL + '/modx/'+module_type+'/'+module_id+'/' + system = I4xSystem(track_function = make_track_function(request), render_function = lambda x: render_module(user, request, x, module_object_preload), ajax_url = ajax_url, - filestore = OSFS(settings.DATA_DIR + xp), + filestore = OSFS(data_root), ) instance=module_class(system, etree.tostring(xml_module), diff --git a/djangoapps/courseware/views.py b/djangoapps/courseware/views.py index 3427442fcc..313259bdb7 100644 --- a/djangoapps/courseware/views.py +++ b/djangoapps/courseware/views.py @@ -249,7 +249,12 @@ def modx_dispatch(request, module=None, dispatch=None, id=None): # get coursename if stored coursename = multicourse_settings.get_coursename_from_request(request) - xp = multicourse_settings.get_course_xmlpath(coursename) # path to XML for the course + + if coursename and settings.ENABLE_MULTICOURSE: + xp = multicourse_settings.get_course_xmlpath(coursename) # path to XML for the course + data_root = settings.DATA_DIR + xp + else: + data_root = settings.DATA_DIR # Grab the XML corresponding to the request from course.xml try: @@ -266,7 +271,7 @@ def modx_dispatch(request, module=None, dispatch=None, id=None): system = I4xSystem(track_function = make_track_function(request), render_function = None, ajax_url = ajax_url, - filestore = OSFS(settings.DATA_DIR + xp), + filestore = OSFS(data_root), ) try: