Commit 2a4b3c96 by Calen Pennington

Fix merge conflicts

parent ff026ea8
...@@ -194,23 +194,16 @@ class VideoStudentViewHandlers(object): ...@@ -194,23 +194,16 @@ class VideoStudentViewHandlers(object):
transcript_name = self.sub transcript_name = self.sub
if transcript_name: if transcript_name:
<<<<<<< HEAD
course = self.descriptor.runtime.modulestore.get_course(self.course_id)
if course.static_asset_path:
=======
course_location = CourseDescriptor.id_to_location(self.course_id)
# Get the asset path for course # Get the asset path for course
asset_path = None asset_path = None
if hasattr(self.descriptor.runtime, 'modulestore'): if hasattr(self.descriptor.runtime, 'modulestore'):
course = self.descriptor.runtime.modulestore.get_item(course_location) course = self.descriptor.runtime.modulestore.get_course(self.course_id)
asset_path = course.static_asset_path asset_path = course.static_asset_path
else: else:
# Handle XML Courses that don't have modulestore in the runtime # Handle XML Courses that don't have modulestore in the runtime
asset_path = getattr(self.descriptor, 'data_dir', None) asset_path = getattr(self.descriptor, 'data_dir', None)
if asset_path: if asset_path:
>>>>>>> edx/master
response = Response( response = Response(
status=307, status=307,
location='/static/{0}/{1}'.format( location='/static/{0}/{1}'.format(
......
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