Merge pull request #18582 from edx/mushtaq/fix-customer-catalog

Fix enterprise customer catalog content filter settings value

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)

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

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

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

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