Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #14907 from edx/zub/ENT-247-enterprise-logo-size-config

Browse Source 
ENT-247 Get enterprise logo image size limit from env configuration
This commit is contained in:
Zubair Afzal
2017-04-21 19:46:09 +05:00
committed by GitHub
parent 7493c11ec2 ff7de56a48
commit 22ab0c8d47
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/envs/aws.py
View File

@@ -916,6 +916,12 @@ ENTERPRISE_ENROLLMENT_API_URL = ENV_TOKENS.get(
ENTERPRISE_ENROLLMENT_API_URL
)
# Enterprise logo image size limit in KB's
ENTERPRISE_CUSTOMER_LOGO_IMAGE_SIZE = ENV_TOKENS.get(
'ENTERPRISE_CUSTOMER_LOGO_IMAGE_SIZE',
ENTERPRISE_CUSTOMER_LOGO_IMAGE_SIZE
)
############## ENTERPRISE SERVICE API CLIENT CONFIGURATION ######################
# The LMS communicates with the Enterprise service via the EdxRestApiClient class

1
lms/envs/common.py
View File

@@ -3090,6 +3090,7 @@ ENTERPRISE_PUBLIC_ENROLLMENT_API_URL = ENTERPRISE_ENROLLMENT_API_URL
ENTERPRISE_API_URL = LMS_ROOT_URL + '/enterprise/api/v1/'
ENTERPRISE_SERVICE_WORKER_USERNAME = 'enterprise_worker'
ENTERPRISE_API_CACHE_TIMEOUT = 3600 # Value is in seconds
ENTERPRISE_CUSTOMER_LOGO_IMAGE_SIZE = 512 # Enterprise logo image size limit in KB's
############## Settings for Course Enrollment Modes ######################
COURSE_ENROLLMENT_MODES = {

2
requirements/edx/base.txt
View File

@@ -52,7 +52,7 @@ edx-lint==0.4.3
astroid==1.3.8
edx-django-oauth2-provider==1.1.4
edx-django-sites-extensions==2.1.1
edx-enterprise==0.33.2
edx-enterprise==0.33.6
edx-oauth2-provider==1.2.0
edx-opaque-keys==0.4.0
edx-organizations==0.4.4