Commit ec394f04 by Calen Pennington

Remove render_module in favor of render_x_module

parent ee08e0ea
...@@ -110,7 +110,7 @@ def get_module(user, request, xml_module, module_object_preload): ...@@ -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+'/' ajax_url = settings.MITX_ROOT_URL + '/modx/'+module_type+'/'+module_id+'/'
system = I4xSystem(track_function = make_track_function(request), 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, ajax_url = ajax_url,
filestore = OSFS(data_root), filestore = OSFS(data_root),
) )
...@@ -155,10 +155,6 @@ def render_x_module(user, request, xml_module, module_object_preload): ...@@ -155,10 +155,6 @@ def render_x_module(user, request, xml_module, module_object_preload):
return content 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): def modx_dispatch(request, module=None, dispatch=None, id=None):
''' Generic view for extensions. ''' ''' Generic view for extensions. '''
......
...@@ -16,7 +16,7 @@ from django.views.decorators.cache import cache_control ...@@ -16,7 +16,7 @@ from django.views.decorators.cache import cache_control
from lxml import etree 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 models import StudentModule
from student.models import UserProfile from student.models import UserProfile
from util.views import accepts from util.views import accepts
...@@ -129,7 +129,7 @@ def render_section(request, section): ...@@ -129,7 +129,7 @@ def render_section(request, section):
module_object_preload = [] module_object_preload = []
try: try:
module = render_module(user, request, dom, module_object_preload) module = render_x_module(user, request, dom, module_object_preload)
except: except:
log.exception("Unable to load module") log.exception("Unable to load module")
context.update({ context.update({
...@@ -219,7 +219,7 @@ def index(request, course=None, chapter="Using the System", section="Hints"): ...@@ -219,7 +219,7 @@ def index(request, course=None, chapter="Using the System", section="Hints"):
} }
try: try:
module = render_module(user, request, module, module_object_preload) module = render_x_module(user, request, module, module_object_preload)
except: except:
log.exception("Unable to load module") log.exception("Unable to load module")
context.update({ context.update({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment