Commit 2223d200 by Calen Pennington

Only display the LMS link if it's set up, and don't error if it isn't

parent c7209a73
...@@ -106,6 +106,16 @@ def edit_item(request): ...@@ -106,6 +106,16 @@ def edit_item(request):
item = modulestore().get_item(item_location) item = modulestore().get_item(item_location)
item.get_html = wrap_xmodule(item.get_html, item, "xmodule_edit.html") 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', { return render_to_response('unit.html', {
'contents': item.get_html(), 'contents': item.get_html(),
'js_module': item.js_module_name, 'js_module': item.js_module_name,
...@@ -114,12 +124,7 @@ def edit_item(request): ...@@ -114,12 +124,7 @@ def edit_item(request):
'previews': get_module_previews(request, item), '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 # 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_link': lms_link,
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,
)
}) })
......
...@@ -19,7 +19,7 @@ DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage' ...@@ -19,7 +19,7 @@ DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
with open(ENV_ROOT / "cms.env.json") as env_file: with open(ENV_ROOT / "cms.env.json") as env_file:
ENV_TOKENS = json.load(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'] SITE_NAME = ENV_TOKENS['SITE_NAME']
......
...@@ -88,6 +88,8 @@ TEMPLATE_CONTEXT_PROCESSORS = ( ...@@ -88,6 +88,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
'django.core.context_processors.csrf', # necessary for csrf protection 'django.core.context_processors.csrf', # necessary for csrf protection
) )
LMS_BASE = None
################################# Jasmine ################################### ################################# Jasmine ###################################
JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee' JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee'
......
...@@ -42,7 +42,9 @@ ...@@ -42,7 +42,9 @@
</section> </section>
</section> </section>
${contents} ${contents}
% if lms_link is not None:
<a class="lms-link" href="${lms_link}">View in LMS</a> <a class="lms-link" href="${lms_link}">View in LMS</a>
% endif
<section class="previews"> <section class="previews">
% for preview in previews: % for preview in previews:
<section class="preview"> <section class="preview">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment