Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
edx-platform-release
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hsin-Yu Chien
edx-platform-release
Commits
29f81807
Unverified
Commit
29f81807
authored
7 years ago
by
Fred Smith
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
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
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
common/lib/xmodule/xmodule/video_module/video_module.py
+2
-1
2 additions, 1 deletion
common/lib/xmodule/xmodule/video_module/video_module.py
with
2 additions
and
1 deletion
common/lib/xmodule/xmodule/video_module/video_module.py
+
2
−
1
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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment