From 2690a77151dbbebea7797543330c679afe48e9b7 Mon Sep 17 00:00:00 2001 From: Sven Marnach Date: Mon, 5 Dec 2016 16:19:02 +0100 Subject: [PATCH] Changes required for the Enterprise app enrollment feature. --- lms/envs/aws.py | 4 ++++ lms/envs/common.py | 7 +++++++ requirements/edx/base.txt | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index cf32f71fb5..d2236f33c0 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -888,3 +888,7 @@ AFFILIATE_COOKIE_NAME = ENV_TOKENS.get('AFFILIATE_COOKIE_NAME', AFFILIATE_COOKIE ############## Settings for LMS Context Sensitive Help ############## DOC_LINK_BASE_URL = ENV_TOKENS.get('DOC_LINK_BASE_URL', DOC_LINK_BASE_URL) + +############## Settings for the Enterprise App ###################### + +ENTERPRISE_ENROLLMENT_API_URL = ENV_TOKENS.get('ENTERPRISE_ENROLLMENT_API_URL', ENTERPRISE_ENROLLMENT_API_URL) diff --git a/lms/envs/common.py b/lms/envs/common.py index d4fb93713c..51359baf23 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -2662,6 +2662,9 @@ OPTIONAL_APPS = ( # Enterprise App (http://github.com/edx/edx-enterprise) 'enterprise', + + # Required by the Enterprise App + 'django_object_actions', # https://github.com/crccheck/django-object-actions ) for app_name in OPTIONAL_APPS: @@ -3024,3 +3027,7 @@ REDIRECT_CACHE_KEY_PREFIX = 'redirects' ############## Settings for LMS Context Sensitive Help ############## DOC_LINK_BASE_URL = None + +############## Settings for the Enterprise App ###################### + +ENTERPRISE_ENROLLMENT_API_URL = LMS_ROOT_URL + "/api/enrollment/v1/" diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 8f34329a91..eedc778ceb 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -50,7 +50,7 @@ edx-enterprise==0.1.0 edx-oauth2-provider==1.2.0 edx-opaque-keys==0.4.0 edx-organizations==0.4.1 -edx-rest-api-client==1.2.1 +edx-rest-api-client==1.6.0 edx-search==0.1.2 facebook-sdk==0.4.0 feedparser==5.1.3