From 470a526d735cd6ab85c989584fc69d21813903c4 Mon Sep 17 00:00:00 2001 From: zubair-arbi Date: Tue, 18 Apr 2017 15:48:28 +0500 Subject: [PATCH 1/2] Get enterprise logo image size limit from env configuration ENT-247 --- lms/envs/aws.py | 6 ++++++ lms/envs/common.py | 1 + 2 files changed, 7 insertions(+) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index b029b97572..de1b4a800e 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -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 diff --git a/lms/envs/common.py b/lms/envs/common.py index 8c65822e3e..943c379d66 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -3086,6 +3086,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 = { From ff7de56a4872cb4c9569c672a5289d6a69abb210 Mon Sep 17 00:00:00 2001 From: zubair-arbi Date: Fri, 21 Apr 2017 12:37:30 +0500 Subject: [PATCH 2/2] bump edx-enterprise version to 0.33.6 --- requirements/edx/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index c8a357e125..bc4d80c352 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -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