Changes required for the Enterprise app enrollment feature.

This commit is contained in:
Sven Marnach
2016-12-05 16:19:02 +01:00
parent 097b6417e1
commit 2690a77151
3 changed files with 12 additions and 1 deletions

View File

@@ -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)

View File

@@ -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/"

View File

@@ -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