From 12011bf19120a6e05d1735acb33077cb41902f28 Mon Sep 17 00:00:00 2001 From: Mushtaq Ali Date: Tue, 10 Jul 2018 19:12:48 +0500 Subject: [PATCH 1/2] Change default content filter to include only courses - ENT-1070 --- lms/envs/aws.py | 6 ++++++ lms/envs/common.py | 1 + 2 files changed, 7 insertions(+) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 0e501ddb22..687ba4663a 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -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 diff --git a/lms/envs/common.py b/lms/envs/common.py index 58e83aac4d..7c9aacee30 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -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 From 42342f2f6f9438c9e5ff7d54c26fbd4834b20fdf Mon Sep 17 00:00:00 2001 From: Mushtaq Ali Date: Thu, 12 Jul 2018 13:03:51 +0500 Subject: [PATCH 2/2] Enterprise version bump --- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index b521fd2350..92ba7a6e96 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.6 +edx-enterprise==0.70.7 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 ed31b431c4..5dc4228a42 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.6 +edx-enterprise==0.70.7 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 4e2a0a5ef7..1c8e96c992 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.6 +edx-enterprise==0.70.7 edx-i18n-tools==0.4.6 edx-lint==0.5.5 edx-milestones==0.1.13