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
8360a7a7
Commit
8360a7a7
authored
Feb 05, 2013
by
Calen Pennington
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug where we imported two functions w/ the same name
parent
74c112e5
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
cms/djangoapps/contentstore/views.py
+2
-2
No files found.
cms/djangoapps/contentstore/views.py
View file @
8360a7a7
...
@@ -31,7 +31,7 @@ from xmodule.modulestore.exceptions import ItemNotFoundError, InvalidLocationErr
...
@@ -31,7 +31,7 @@ from xmodule.modulestore.exceptions import ItemNotFoundError, InvalidLocationErr
from
xmodule.x_module
import
ModuleSystem
from
xmodule.x_module
import
ModuleSystem
from
xmodule.error_module
import
ErrorDescriptor
from
xmodule.error_module
import
ErrorDescriptor
from
xmodule.errortracker
import
exc_info_to_str
from
xmodule.errortracker
import
exc_info_to_str
from
static_replace
import
replace_static_urls
import
static_replace
from
external_auth.views
import
ssl_login_shortcut
from
external_auth.views
import
ssl_login_shortcut
from
mitxmako.shortcuts
import
render_to_response
,
render_to_string
from
mitxmako.shortcuts
import
render_to_response
,
render_to_string
...
@@ -473,7 +473,7 @@ def preview_module_system(request, preview_id, descriptor):
...
@@ -473,7 +473,7 @@ def preview_module_system(request, preview_id, descriptor):
get_module
=
partial
(
get_preview_module
,
request
,
preview_id
),
get_module
=
partial
(
get_preview_module
,
request
,
preview_id
),
render_template
=
render_from_lms
,
render_template
=
render_from_lms
,
debug
=
True
,
debug
=
True
,
replace_urls
=
partial
(
replace_static_urls
,
data_directory
=
None
,
course_namespace
=
descriptor
.
location
),
replace_urls
=
partial
(
static_replace
.
replace_static_urls
,
data_directory
=
None
,
course_namespace
=
descriptor
.
location
),
user
=
request
.
user
,
user
=
request
.
user
,
)
)
...
...
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