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

Merge pull request #14671 from open-craft/jill/enterprise-public-enrollment-api-url

Browse Source 
Adds ENTERPRISE_PUBLIC_ENROLLMENT_API_URL to settings
This commit is contained in:
Jillian Vogel
2017-03-18 18:23:47 +10:30
committed by GitHub
parent 6a954c1e4e be088dd924
commit 9330cca5ac
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/envs/aws.py
View File

@@ -904,7 +904,15 @@ 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',
# Publicly-accessible enrollment URL, for use on the client side.
ENTERPRISE_PUBLIC_ENROLLMENT_API_URL = ENV_TOKENS.get(
'ENTERPRISE_PUBLIC_ENROLLMENT_API_URL',
(LMS_ROOT_URL or '') + '/api/enrollment/v1/'
)
# Enrollment URL used on the server-side.
# If not overridden in ENV_TOKENS, then fallback to the value set in env/common.py
ENTERPRISE_ENROLLMENT_API_URL = ENV_TOKENS.get(
'ENTERPRISE_ENROLLMENT_API_URL',
ENTERPRISE_ENROLLMENT_API_URL
)

1
lms/envs/common.py
View File

@@ -3062,3 +3062,4 @@ DOC_LINK_BASE_URL = None
############## Settings for the Enterprise App ######################
ENTERPRISE_ENROLLMENT_API_URL = LMS_ROOT_URL + "/api/enrollment/v1/"
ENTERPRISE_PUBLIC_ENROLLMENT_API_URL = ENTERPRISE_ENROLLMENT_API_URL

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.27.3
edx-enterprise==0.27.4
edx-oauth2-provider==1.2.0
edx-opaque-keys==0.4.0
edx-organizations==0.4.3