diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 407effa4d17770c16702b023e6490ee1765e8859..dc5991d6143aafdb1adbd961a9cc68ba2047f924 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -580,6 +580,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 +) + ############### Settings for Retirement ##################### RETIRED_USERNAME_PREFIX = ENV_TOKENS.get('RETIRED_USERNAME_PREFIX', RETIRED_USERNAME_PREFIX) RETIRED_EMAIL_PREFIX = ENV_TOKENS.get('RETIRED_EMAIL_PREFIX', RETIRED_EMAIL_PREFIX) diff --git a/cms/envs/common.py b/cms/envs/common.py index b2d04963bcbfc77a5c21b6ad7b4a550aedd6ddd5..b39b1aab27a7dc47d4a2699a1a29829b200d52f9 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -1475,6 +1475,7 @@ ENTERPRISE_SERVICE_WORKER_USERNAME = 'enterprise_worker' ENTERPRISE_API_CACHE_TIMEOUT = 3600 # Value is in seconds # The default value of this needs to be a 16 character string ENTERPRISE_REPORTING_SECRET = '0000000000000000' +ENTERPRISE_CUSTOMER_CATALOG_DEFAULT_CONTENT_FILTER = {} ############## Settings for the Discovery App ###################### diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 92ba7a6e96cb357e8d7d38fe96fcaceca5d2a005..7cd522e264af572012720c6bc80b81349fb1766b 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -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.7 +edx-enterprise==0.70.8 edx-i18n-tools==0.4.6 edx-milestones==0.1.13 edx-oauth2-provider==1.2.2 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 5dc4228a42eed2e919de0a5fbb912f366bf4b19d..d9535f734ff69b0dc6aa4e6381eb60ed8e642e62 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -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.7 +edx-enterprise==0.70.8 edx-i18n-tools==0.4.6 edx-lint==0.5.5 edx-milestones==0.1.13 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 1c8e96c992d6b2c68034009939def3d537a864f2..80f8669ec9773656d650d9b0b155a7b7eef6484e 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -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.7 +edx-enterprise==0.70.8 edx-i18n-tools==0.4.6 edx-lint==0.5.5 edx-milestones==0.1.13