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
2223d200
Commit
2223d200
authored
Sep 20, 2012
by
Calen Pennington
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only display the LMS link if it's set up, and don't error if it isn't
parent
c7209a73
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
7 deletions
+16
-7
cms/djangoapps/contentstore/views.py
+11
-6
cms/envs/aws.py
+1
-1
cms/envs/common.py
+2
-0
cms/templates/unit.html
+2
-0
No files found.
cms/djangoapps/contentstore/views.py
View file @
2223d200
...
...
@@ -106,6 +106,16 @@ def edit_item(request):
item
=
modulestore
()
.
get_item
(
item_location
)
item
.
get_html
=
wrap_xmodule
(
item
.
get_html
,
item
,
"xmodule_edit.html"
)
if
settings
.
LMS_BASE
is
not
None
:
lms_link
=
"{lms_base}/courses/{course_id}/jump_to/{location}"
.
format
(
lms_base
=
settings
.
LMS_BASE
,
# TODO: These will need to be changed to point to the particular instance of this problem in the particular course
course_id
=
[
course
.
id
for
course
in
modulestore
()
.
get_courses
()
if
course
.
location
.
org
==
item
.
location
.
org
and
course
.
location
.
course
==
item
.
location
.
course
][
0
],
location
=
item
.
location
,
)
else
:
lms_link
=
None
return
render_to_response
(
'unit.html'
,
{
'contents'
:
item
.
get_html
(),
'js_module'
:
item
.
js_module_name
,
...
...
@@ -114,12 +124,7 @@ def edit_item(request):
'previews'
:
get_module_previews
(
request
,
item
),
'metadata'
:
item
.
metadata
,
# TODO: It would be nice to able to use reverse here in some form, but we don't have the lms urls imported
'lms_link'
:
"{lms_base}/courses/{course_id}/jump_to/{location}"
.
format
(
lms_base
=
settings
.
LMS_BASE
,
# TODO: These will need to be changed to point to the particular instance of this problem in the particular course
course_id
=
[
course
.
id
for
course
in
modulestore
()
.
get_courses
()
if
course
.
location
.
org
==
item
.
location
.
org
and
course
.
location
.
course
==
item
.
location
.
course
][
0
],
location
=
item
.
location
,
)
'lms_link'
:
lms_link
,
})
...
...
cms/envs/aws.py
View file @
2223d200
...
...
@@ -19,7 +19,7 @@ DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
with
open
(
ENV_ROOT
/
"cms.env.json"
)
as
env_file
:
ENV_TOKENS
=
json
.
load
(
env_file
)
LMS_BASE
=
ENV_TOKENS
[
'LMS_BASE'
]
LMS_BASE
=
ENV_TOKENS
.
get
(
'LMS_BASE'
)
SITE_NAME
=
ENV_TOKENS
[
'SITE_NAME'
]
...
...
cms/envs/common.py
View file @
2223d200
...
...
@@ -88,6 +88,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
'django.core.context_processors.csrf'
,
# necessary for csrf protection
)
LMS_BASE
=
None
################################# Jasmine ###################################
JASMINE_TEST_DIRECTORY
=
PROJECT_ROOT
+
'/static/coffee'
...
...
cms/templates/unit.html
View file @
2223d200
...
...
@@ -42,7 +42,9 @@
</section>
</section>
${contents}
% if lms_link is not None:
<a
class=
"lms-link"
href=
"${lms_link}"
>
View in LMS
</a>
% endif
<section
class=
"previews"
>
% for preview in previews:
<section
class=
"preview"
>
...
...
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