Commit f439a09e by Andy Armstrong

Obey microsite configuration for default profile image

TNL-2073
parent d0db3734
...@@ -601,9 +601,10 @@ if FEATURES.get('INDIVIDUAL_DUE_DATES'): ...@@ -601,9 +601,10 @@ if FEATURES.get('INDIVIDUAL_DUE_DATES'):
# PROFILE IMAGE CONFIG # PROFILE IMAGE CONFIG
PROFILE_IMAGE_BACKEND = ENV_TOKENS.get('PROFILE_IMAGE_BACKEND', PROFILE_IMAGE_BACKEND) 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_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_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) PROFILE_IMAGE_MIN_BYTES = ENV_TOKENS.get('PROFILE_IMAGE_MIN_BYTES', PROFILE_IMAGE_MIN_BYTES)
if FEATURES['IS_EDX_DOMAIN']: if FEATURES['IS_EDX_DOMAIN']:
PROFILE_IMAGE_DEFAULT_FILENAME = 'images/edx-theme/default-profile' 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)
...@@ -8,6 +8,8 @@ from django.core.exceptions import ObjectDoesNotExist ...@@ -8,6 +8,8 @@ from django.core.exceptions import ObjectDoesNotExist
from django.core.files.storage import get_storage_class from django.core.files.storage import get_storage_class
from staticfiles.storage import staticfiles_storage from staticfiles.storage import staticfiles_storage
from microsite_configuration import microsite
from student.models import UserProfile from student.models import UserProfile
from ..errors import UserNotFound from ..errors import UserNotFound
...@@ -108,7 +110,7 @@ def _get_default_profile_image_urls(): ...@@ -108,7 +110,7 @@ def _get_default_profile_image_urls():
TODO The result of this function should be memoized, but not in tests. TODO The result of this function should be memoized, but not in tests.
""" """
return _get_profile_image_urls( return _get_profile_image_urls(
settings.PROFILE_IMAGE_DEFAULT_FILENAME, microsite.get_value('PROFILE_IMAGE_DEFAULT_FILENAME', settings.PROFILE_IMAGE_DEFAULT_FILENAME),
staticfiles_storage, staticfiles_storage,
file_extension=settings.PROFILE_IMAGE_DEFAULT_FILE_EXTENSION, file_extension=settings.PROFILE_IMAGE_DEFAULT_FILE_EXTENSION,
) )
......
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