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
f439a09e
Commit
f439a09e
authored
Apr 27, 2015
by
Andy Armstrong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Obey microsite configuration for default profile image
TNL-2073
parent
d0db3734
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
lms/envs/aws.py
+2
-1
openedx/core/djangoapps/user_api/accounts/image_helpers.py
+3
-1
No files found.
lms/envs/aws.py
View file @
f439a09e
...
...
@@ -601,9 +601,10 @@ if FEATURES.get('INDIVIDUAL_DUE_DATES'):
# PROFILE IMAGE CONFIG
PROFILE_IMAGE_BACKEND
=
ENV_TOKENS
.
get
(
'PROFILE_IMAGE_BACKEND'
,
PROFILE_IMAGE_BACKEND
)
PROFILE_IMAGE_DEFAULT_FILENAME
=
ENV_TOKENS
.
get
(
'PROFILE_IMAGE_DEFAULT_FILENAME'
,
PROFILE_IMAGE_DEFAULT_FILENAME
)
PROFILE_IMAGE_SECRET_KEY
=
AUTH_TOKENS
.
get
(
'PROFILE_IMAGE_SECRET_KEY'
,
PROFILE_IMAGE_SECRET_KEY
)
PROFILE_IMAGE_MAX_BYTES
=
ENV_TOKENS
.
get
(
'PROFILE_IMAGE_MAX_BYTES'
,
PROFILE_IMAGE_MAX_BYTES
)
PROFILE_IMAGE_MIN_BYTES
=
ENV_TOKENS
.
get
(
'PROFILE_IMAGE_MIN_BYTES'
,
PROFILE_IMAGE_MIN_BYTES
)
if
FEATURES
[
'IS_EDX_DOMAIN'
]:
PROFILE_IMAGE_DEFAULT_FILENAME
=
'images/edx-theme/default-profile'
else
:
PROFILE_IMAGE_DEFAULT_FILENAME
=
ENV_TOKENS
.
get
(
'PROFILE_IMAGE_DEFAULT_FILENAME'
,
PROFILE_IMAGE_DEFAULT_FILENAME
)
openedx/core/djangoapps/user_api/accounts/image_helpers.py
View file @
f439a09e
...
...
@@ -8,6 +8,8 @@ from django.core.exceptions import ObjectDoesNotExist
from
django.core.files.storage
import
get_storage_class
from
staticfiles.storage
import
staticfiles_storage
from
microsite_configuration
import
microsite
from
student.models
import
UserProfile
from
..errors
import
UserNotFound
...
...
@@ -108,7 +110,7 @@ def _get_default_profile_image_urls():
TODO The result of this function should be memoized, but not in tests.
"""
return
_get_profile_image_urls
(
settings
.
PROFILE_IMAGE_DEFAULT_FILENAME
,
microsite
.
get_value
(
'PROFILE_IMAGE_DEFAULT_FILENAME'
,
settings
.
PROFILE_IMAGE_DEFAULT_FILENAME
)
,
staticfiles_storage
,
file_extension
=
settings
.
PROFILE_IMAGE_DEFAULT_FILE_EXTENSION
,
)
...
...
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