Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make separate links for lms_preview and lms as needed

Browse Source
This commit is contained in:
Calen Pennington
2012-10-12 15:03:06 -04:00
parent d10f56dd08
commit 607b99dece
7 changed files with 90 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cms/djangoapps/contentstore/utils.py
View File

@@ -1,7 +1,6 @@
from django.conf import settings
from xmodule.modulestore import Location
from xmodule.modulestore.django import modulestore
from xmodule.modulestore.draft import DRAFT
from xmodule.modulestore.exceptions import ItemNotFoundError
@@ -35,13 +34,14 @@ def get_course_location_for_item(location):
return location
def get_lms_link_for_item(location):
def get_lms_link_for_item(location, preview=False):
location = Location(location)
if settings.LMS_BASE is not None:
lms_link = "{lms_base}/courses/{course_id}/jump_to/{location}".format(
lms_link = "//{preview}{lms_base}/courses/{course_id}/jump_to/{location}".format(
preview='preview.' if preview else '',
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 = modulestore().get_containing_courses(location)[0].id,
course_id=modulestore().get_containing_courses(location)[0].id,
location=location,
)
else:

10
cms/djangoapps/contentstore/views.py
View File

@@ -188,6 +188,7 @@ def edit_subsection(request, location):
break
lms_link = get_lms_link_for_item(location)
preview_link = get_lms_link_for_item(location, preview=True)
# make sure that location references a 'sequential', otherwise return BadRequest
if item.location.category != 'sequential':
@@ -214,7 +215,8 @@ def edit_subsection(request, location):
'context_course': course,
'create_new_unit_template': Location('i4x', 'edx', 'templates', 'vertical', 'Empty'),
'lms_link': lms_link,
'parent_item' : parent,
'preview_link': preview_link,
'parent_item': parent,
'policy_metadata' : policy_metadata
})
@@ -240,8 +242,8 @@ def edit_unit(request, location):
course.location.course == item.location.course):
break
# The non-draft location
lms_link = get_lms_link_for_item(item.location._replace(revision=None))
lms_link = get_lms_link_for_item(item.location)
preview_lms_link = get_lms_link_for_item(item.location, preview=True)
component_templates = defaultdict(list)
@@ -282,7 +284,7 @@ def edit_unit(request, location):
'unit_location': location,
'components': components,
'component_templates': component_templates,
'draft_preview_link': lms_link,
'draft_preview_link': preview_lms_link,
'published_preview_link': lms_link,
'subsection': containing_subsection,
'section': containing_section,