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

Merge pull request #18551 from edx/mushtaq/change-content-filter

Browse Source 
Change default content filter to include only courses
This commit is contained in:
Mushtaq Ali
2018-07-12 16:52:45 +05:00
committed by GitHub
parent b42bd2bf7d 42342f2f6f
commit a66675dc8f
5 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/envs/aws.py
View File

@@ -984,6 +984,12 @@ ENTERPRISE_REPORTING_SECRET = AUTH_TOKENS.get(
ENTERPRISE_REPORTING_SECRET
)
# A default dictionary to be used for filtering out enterprise customer catalog.
ENTERPRISE_CUSTOMER_CATALOG_DEFAULT_CONTENT_FILTER = ENV_TOKENS.get(
'ENTERPRISE_CUSTOMER_CATALOG_DEFAULT_CONTENT_FILTER',
ENTERPRISE_CUSTOMER_CATALOG_DEFAULT_CONTENT_FILTER
)
############## ENTERPRISE SERVICE API CLIENT CONFIGURATION ######################
# The LMS communicates with the Enterprise service via the EdxRestApiClient class
# The below environmental settings are utilized by the LMS when interacting with

1
lms/envs/common.py
View File

@@ -3348,6 +3348,7 @@ ENTERPRISE_COURSE_ENROLLMENT_AUDIT_MODES = ['audit', 'honor']
ENTERPRISE_SUPPORT_URL = ''
# The default value of this needs to be a 16 character string
ENTERPRISE_REPORTING_SECRET = '0000000000000000'
ENTERPRISE_CUSTOMER_CATALOG_DEFAULT_CONTENT_FILTER = {}
############## ENTERPRISE SERVICE API CLIENT CONFIGURATION ######################
# The LMS communicates with the Enterprise service via the EdxRestApiClient class

2
requirements/edx/base.txt
View File

@@ -116,7 +116,7 @@ edx-django-oauth2-provider==1.3.3
edx-django-release-util==0.3.1
edx-django-sites-extensions==2.3.1
edx-drf-extensions==1.5.2
edx-enterprise==0.70.6
edx-enterprise==0.70.7
edx-i18n-tools==0.4.6
edx-milestones==0.1.13
edx-oauth2-provider==1.2.2

2
requirements/edx/development.txt
View File

@@ -136,7 +136,7 @@ edx-django-oauth2-provider==1.3.3
edx-django-release-util==0.3.1
edx-django-sites-extensions==2.3.1
edx-drf-extensions==1.5.2
edx-enterprise==0.70.6
edx-enterprise==0.70.7
edx-i18n-tools==0.4.6
edx-lint==0.5.5
edx-milestones==0.1.13

2
requirements/edx/testing.txt
View File

@@ -131,7 +131,7 @@ edx-django-oauth2-provider==1.3.3
edx-django-release-util==0.3.1
edx-django-sites-extensions==2.3.1
edx-drf-extensions==1.5.2
edx-enterprise==0.70.6
edx-enterprise==0.70.7
edx-i18n-tools==0.4.6
edx-lint==0.5.5
edx-milestones==0.1.13