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
29f81807
Unverified
Commit
29f81807
authored
Nov 17, 2017
by
Fred Smith
Committed by
GitHub
Nov 17, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #16593 from edx/derf/be_able_to_configure_default_video_cdn_url
be able to configure default video cdn url
parents
77100cd4
14c7c508
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
common/lib/xmodule/xmodule/video_module/video_module.py
+2
-1
No files found.
common/lib/xmodule/xmodule/video_module/video_module.py
View file @
29f81807
...
...
@@ -216,7 +216,8 @@ class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers,
# Determine if there is an alternative source for this video
# based on user locale. This exists to support cases where
# we leverage a geography specific CDN, like China.
cdn_url
=
getattr
(
settings
,
'VIDEO_CDN_URL'
,
{})
.
get
(
self
.
system
.
user_location
)
default_cdn_url
=
getattr
(
settings
,
'VIDEO_CDN_URL'
,
{})
.
get
(
'default'
)
cdn_url
=
getattr
(
settings
,
'VIDEO_CDN_URL'
,
{})
.
get
(
self
.
system
.
user_location
,
default_cdn_url
)
# If we have an edx_video_id, we prefer its values over what we store
# internally for download links (source, html5_sources) and the youtube
...
...
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