Merge branch 'release'

lms/templates/conditional_module.html

@@ -1,14 +1,10 @@
 <%
-from django.core.urlresolvers import reverse
 
-# course_id = module.location.course_id
-def get_course_id(module):
-    return module.location.org +'/' + module.location.course +'/' + \
-                module.system.ajax_url.split('/')[4]
+from django.core.urlresolvers import reverse
 
 def _message(reqm, message):
     return message.format(link="<a href={url}>{url_name}</a>".format(
-        url = reverse('jump_to', kwargs=dict(course_id=get_course_id(reqm),
+        url = reverse('jump_to', kwargs=dict(course_id=reqm.course_id,
                         location=reqm.location.url())),
         url_name = reqm.display_name_with_default))
 %>