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
58a5cdd8
Commit
58a5cdd8
authored
Sep 09, 2013
by
Calen Pennington
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace references to .system
parent
b53d5554
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
cms/djangoapps/contentstore/views/preview.py
+1
-1
common/lib/xmodule/xmodule/error_module.py
+1
-1
common/lib/xmodule/xmodule/tests/test_error_module.py
+2
-2
lms/djangoapps/courseware/module_render.py
+1
-1
No files found.
cms/djangoapps/contentstore/views/preview.py
View file @
58a5cdd8
...
@@ -109,7 +109,7 @@ def preview_module_system(request, preview_id, descriptor):
...
@@ -109,7 +109,7 @@ def preview_module_system(request, preview_id, descriptor):
ajax_url
=
reverse
(
'preview_dispatch'
,
args
=
[
preview_id
,
descriptor
.
location
.
url
(),
''
])
.
rstrip
(
'/'
),
ajax_url
=
reverse
(
'preview_dispatch'
,
args
=
[
preview_id
,
descriptor
.
location
.
url
(),
''
])
.
rstrip
(
'/'
),
# TODO (cpennington): Do we want to track how instructors are using the preview problems?
# TODO (cpennington): Do we want to track how instructors are using the preview problems?
track_function
=
lambda
event_type
,
event
:
None
,
track_function
=
lambda
event_type
,
event
:
None
,
filestore
=
descriptor
.
system
.
resources_fs
,
filestore
=
descriptor
.
runtime
.
resources_fs
,
get_module
=
partial
(
load_preview_module
,
request
,
preview_id
),
get_module
=
partial
(
load_preview_module
,
request
,
preview_id
),
render_template
=
render_from_lms
,
render_template
=
render_from_lms
,
debug
=
True
,
debug
=
True
,
...
...
common/lib/xmodule/xmodule/error_module.py
View file @
58a5cdd8
...
@@ -129,7 +129,7 @@ class ErrorDescriptor(ErrorFields, XModuleDescriptor):
...
@@ -129,7 +129,7 @@ class ErrorDescriptor(ErrorFields, XModuleDescriptor):
@classmethod
@classmethod
def
from_descriptor
(
cls
,
descriptor
,
error_msg
=
'Error not available'
):
def
from_descriptor
(
cls
,
descriptor
,
error_msg
=
'Error not available'
):
return
cls
.
_construct
(
return
cls
.
_construct
(
descriptor
.
system
,
descriptor
.
runtime
,
str
(
descriptor
),
str
(
descriptor
),
error_msg
,
error_msg
,
location
=
descriptor
.
location
,
location
=
descriptor
.
location
,
...
...
common/lib/xmodule/xmodule/tests/test_error_module.py
View file @
58a5cdd8
...
@@ -37,7 +37,7 @@ class TestErrorModule(unittest.TestCase, SetupTestErrorModules):
...
@@ -37,7 +37,7 @@ class TestErrorModule(unittest.TestCase, SetupTestErrorModules):
def
test_error_module_from_descriptor
(
self
):
def
test_error_module_from_descriptor
(
self
):
descriptor
=
MagicMock
([
XModuleDescriptor
],
descriptor
=
MagicMock
([
XModuleDescriptor
],
system
=
self
.
system
,
runtime
=
self
.
system
,
location
=
self
.
location
,
location
=
self
.
location
,
_field_data
=
self
.
valid_xml
)
_field_data
=
self
.
valid_xml
)
...
@@ -72,7 +72,7 @@ class TestNonStaffErrorModule(unittest.TestCase, SetupTestErrorModules):
...
@@ -72,7 +72,7 @@ class TestNonStaffErrorModule(unittest.TestCase, SetupTestErrorModules):
def
test_error_module_from_descriptor
(
self
):
def
test_error_module_from_descriptor
(
self
):
descriptor
=
MagicMock
([
XModuleDescriptor
],
descriptor
=
MagicMock
([
XModuleDescriptor
],
system
=
self
.
system
,
runtime
=
self
.
system
,
location
=
self
.
location
,
location
=
self
.
location
,
_field_data
=
self
.
valid_xml
)
_field_data
=
self
.
valid_xml
)
...
...
lms/djangoapps/courseware/module_render.py
View file @
58a5cdd8
...
@@ -344,7 +344,7 @@ def get_module_for_descriptor_internal(user, descriptor, field_data_cache, cours
...
@@ -344,7 +344,7 @@ def get_module_for_descriptor_internal(user, descriptor, field_data_cache, cours
ajax_url
=
ajax_url
,
ajax_url
=
ajax_url
,
xqueue
=
xqueue
,
xqueue
=
xqueue
,
# TODO (cpennington): Figure out how to share info between systems
# TODO (cpennington): Figure out how to share info between systems
filestore
=
descriptor
.
system
.
resources_fs
,
filestore
=
descriptor
.
runtime
.
resources_fs
,
get_module
=
inner_get_module
,
get_module
=
inner_get_module
,
user
=
user
,
user
=
user
,
# TODO (cpennington): This should be removed when all html from
# TODO (cpennington): This should be removed when all html from
...
...
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