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
c7209a73
Commit
c7209a73
authored
Sep 17, 2012
by
Calen Pennington
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add links from the editing page for the cms to the corresponding page in the lms
parent
71f39bc4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
1 deletions
+14
-1
cms/djangoapps/contentstore/views.py
+9
-1
cms/envs/aws.py
+2
-0
cms/envs/dev.py
+2
-0
cms/templates/unit.html
+1
-0
No files found.
cms/djangoapps/contentstore/views.py
View file @
c7209a73
...
...
@@ -8,6 +8,7 @@ from django.contrib.auth.decorators import login_required
from
django.core.context_processors
import
csrf
from
django_future.csrf
import
ensure_csrf_cookie
from
django.core.urlresolvers
import
reverse
from
django.conf
import
settings
from
xmodule.modulestore
import
Location
from
xmodule.x_module
import
ModuleSystem
...
...
@@ -111,7 +112,14 @@ def edit_item(request):
'category'
:
item
.
category
,
'url_name'
:
item
.
url_name
,
'previews'
:
get_module_previews
(
request
,
item
),
'metadata'
:
item
.
metadata
'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
,
)
})
...
...
cms/envs/aws.py
View file @
c7209a73
...
...
@@ -19,6 +19,8 @@ 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'
]
SITE_NAME
=
ENV_TOKENS
[
'SITE_NAME'
]
LOG_DIR
=
ENV_TOKENS
[
'LOG_DIR'
]
...
...
cms/envs/dev.py
View file @
c7209a73
...
...
@@ -36,6 +36,8 @@ DATABASES = {
}
}
LMS_BASE
=
"http://localhost:8000"
REPOS
=
{
'edx4edx'
:
{
'branch'
:
'master'
,
...
...
cms/templates/unit.html
View file @
c7209a73
...
...
@@ -42,6 +42,7 @@
</section>
</section>
${contents}
<a
class=
"lms-link"
href=
"${lms_link}"
>
View in LMS
</a>
<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