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

Remove render_module in favor of render_x_module

Browse Source
This commit is contained in:
Calen Pennington
2012-06-01 16:37:03 -04:00
parent 794022733d
commit d49d0b9119
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
djangoapps/courseware/module_render.py
View File

@@ -110,7 +110,7 @@ def get_module(user, request, xml_module, module_object_preload):
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),
render_function = lambda x: render_x_module(user, request, x, module_object_preload),
ajax_url = ajax_url,
filestore = OSFS(data_root),
)
@@ -155,10 +155,6 @@ def render_x_module(user, request, xml_module, module_object_preload):
return content
def render_module(user, request, module, module_object_preload):
''' Generic dispatch for internal modules. '''
return render_x_module(user, request, module, module_object_preload)
def modx_dispatch(request, module=None, dispatch=None, id=None):
''' Generic view for extensions. '''

6
djangoapps/courseware/views.py
View File

@@ -16,7 +16,7 @@ from django.views.decorators.cache import cache_control
from lxml import etree
from module_render import render_module, make_track_function, I4xSystem, modx_dispatch
from module_render import render_x_module, make_track_function, I4xSystem
from models import StudentModule
from student.models import UserProfile
from util.views import accepts
@@ -129,7 +129,7 @@ def render_section(request, section):
module_object_preload = []
try:
module = render_module(user, request, dom, module_object_preload)
module = render_x_module(user, request, dom, module_object_preload)
except:
log.exception("Unable to load module")
context.update({
@@ -219,7 +219,7 @@ def index(request, course=None, chapter="Using the System", section="Hints"):
}
try:
module = render_module(user, request, module, module_object_preload)
module = render_x_module(user, request, module, module_object_preload)
except:
log.exception("Unable to load module")
context.update({