Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
d49d0b91
Commit
d49d0b91
authored
Jun 01, 2012
by
Calen Pennington
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove render_module in favor of render_x_module
parent
79402273
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
8 deletions
+4
-8
djangoapps/courseware/module_render.py
+1
-5
djangoapps/courseware/views.py
+3
-3
No files found.
djangoapps/courseware/module_render.py
View file @
d49d0b91
...
...
@@ -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. '''
...
...
djangoapps/courseware/views.py
View file @
d49d0b91
...
...
@@ -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
({
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment