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
a7d6f843
Commit
a7d6f843
authored
Dec 06, 2017
by
Calen Pennington
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't use the edx-platform revision as the studio assets base url
parent
98b391a2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
cms/envs/aws.py
+2
-2
cms/envs/common.py
+3
-2
cms/envs/yaml_config.py
+2
-2
No files found.
cms/envs/aws.py
View file @
a7d6f843
...
@@ -102,7 +102,7 @@ if STATIC_URL_BASE:
...
@@ -102,7 +102,7 @@ if STATIC_URL_BASE:
STATIC_URL
=
STATIC_URL_BASE
.
encode
(
'ascii'
)
STATIC_URL
=
STATIC_URL_BASE
.
encode
(
'ascii'
)
if
not
STATIC_URL
.
endswith
(
"/"
):
if
not
STATIC_URL
.
endswith
(
"/"
):
STATIC_URL
+=
"/"
STATIC_URL
+=
"/"
STATIC_URL
+=
EDX_PLATFORM_REVISION
+
"/"
STATIC_URL
+=
'studio/'
# DEFAULT_COURSE_ABOUT_IMAGE_URL specifies the default image to show for courses that don't provide one
# DEFAULT_COURSE_ABOUT_IMAGE_URL specifies the default image to show for courses that don't provide one
DEFAULT_COURSE_ABOUT_IMAGE_URL
=
ENV_TOKENS
.
get
(
'DEFAULT_COURSE_ABOUT_IMAGE_URL'
,
DEFAULT_COURSE_ABOUT_IMAGE_URL
)
DEFAULT_COURSE_ABOUT_IMAGE_URL
=
ENV_TOKENS
.
get
(
'DEFAULT_COURSE_ABOUT_IMAGE_URL'
,
DEFAULT_COURSE_ABOUT_IMAGE_URL
)
...
@@ -126,7 +126,7 @@ GITHUB_REPO_ROOT = ENV_TOKENS.get('GITHUB_REPO_ROOT', GITHUB_REPO_ROOT)
...
@@ -126,7 +126,7 @@ GITHUB_REPO_ROOT = ENV_TOKENS.get('GITHUB_REPO_ROOT', GITHUB_REPO_ROOT)
STATIC_ROOT_BASE
=
ENV_TOKENS
.
get
(
'STATIC_ROOT_BASE'
,
None
)
STATIC_ROOT_BASE
=
ENV_TOKENS
.
get
(
'STATIC_ROOT_BASE'
,
None
)
if
STATIC_ROOT_BASE
:
if
STATIC_ROOT_BASE
:
STATIC_ROOT
=
path
(
STATIC_ROOT_BASE
)
/
EDX_PLATFORM_REVISION
STATIC_ROOT
=
path
(
STATIC_ROOT_BASE
)
/
'studio'
WEBPACK_LOADER
[
'DEFAULT'
][
'STATS_FILE'
]
=
STATIC_ROOT
/
"webpack-stats.json"
WEBPACK_LOADER
[
'DEFAULT'
][
'STATS_FILE'
]
=
STATIC_ROOT
/
"webpack-stats.json"
EMAIL_BACKEND
=
ENV_TOKENS
.
get
(
'EMAIL_BACKEND'
,
EMAIL_BACKEND
)
EMAIL_BACKEND
=
ENV_TOKENS
.
get
(
'EMAIL_BACKEND'
,
EMAIL_BACKEND
)
...
...
cms/envs/common.py
View file @
a7d6f843
...
@@ -612,8 +612,8 @@ if not EDX_PLATFORM_REVISION:
...
@@ -612,8 +612,8 @@ if not EDX_PLATFORM_REVISION:
EDX_PLATFORM_REVISION
=
'unknown'
EDX_PLATFORM_REVISION
=
'unknown'
# Static content
# Static content
STATIC_URL
=
'/static/
'
+
EDX_PLATFORM_REVISION
+
"/"
STATIC_URL
=
'/static/
studio/'
STATIC_ROOT
=
ENV_ROOT
/
"staticfiles"
/
EDX_PLATFORM_REVISION
STATIC_ROOT
=
ENV_ROOT
/
"staticfiles"
/
'studio'
STATICFILES_DIRS
=
[
STATICFILES_DIRS
=
[
COMMON_ROOT
/
"static"
,
COMMON_ROOT
/
"static"
,
...
@@ -829,6 +829,7 @@ PIPELINE_YUI_BINARY = 'yui-compressor'
...
@@ -829,6 +829,7 @@ PIPELINE_YUI_BINARY = 'yui-compressor'
################################# DJANGO-REQUIRE ###############################
################################# DJANGO-REQUIRE ###############################
# The baseUrl to pass to the r.js optimizer, relative to STATIC_ROOT.
# The baseUrl to pass to the r.js optimizer, relative to STATIC_ROOT.
REQUIRE_BASE_URL
=
"./"
REQUIRE_BASE_URL
=
"./"
...
...
cms/envs/yaml_config.py
View file @
a7d6f843
...
@@ -169,10 +169,10 @@ if STATIC_URL_BASE:
...
@@ -169,10 +169,10 @@ if STATIC_URL_BASE:
STATIC_URL
=
STATIC_URL_BASE
.
encode
(
'ascii'
)
STATIC_URL
=
STATIC_URL_BASE
.
encode
(
'ascii'
)
if
not
STATIC_URL
.
endswith
(
"/"
):
if
not
STATIC_URL
.
endswith
(
"/"
):
STATIC_URL
+=
"/"
STATIC_URL
+=
"/"
STATIC_URL
+=
EDX_PLATFORM_REVISION
+
"/"
STATIC_URL
+=
'studio/'
if
STATIC_ROOT_BASE
:
if
STATIC_ROOT_BASE
:
STATIC_ROOT
=
path
(
STATIC_ROOT_BASE
)
/
EDX_PLATFORM_REVISION
STATIC_ROOT
=
path
(
STATIC_ROOT_BASE
)
/
'studio'
# Cache used for location mapping -- called many times with the same key/value
# Cache used for location mapping -- called many times with the same key/value
...
...
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