Merge pull request #492 from edx/hammad/WL-1920

WL-1920 | Audit track enrollments appearing in customer's learner progress report
openedx · Jun 11, 2019 · 55b4568 · 55b4568
2 parents d98daf5 + bc8b0b9
commit 55b4568
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -14,6 +14,11 @@ Change Log
 Unreleased
 ----------
 
+[1.6.7] - 2019-06-11
+--------------------
+
+* added enable_audit_data_reporting in EnterpriseCustomerSerializer
+
 [1.6.6] - 2019-06-10
 --------------------
 

diff --git a/enterprise/__init__.py b/enterprise/__init__.py
@@ -4,6 +4,6 @@
 
 from __future__ import absolute_import, unicode_literals
 
-__version__ = "1.6.6"
+__version__ = "1.6.7"
 
 default_app_config = "enterprise.apps.EnterpriseConfig"  # pylint: disable=invalid-name
diff --git a/enterprise/api/v1/serializers.py b/enterprise/api/v1/serializers.py
@@ -116,7 +116,7 @@ class Meta:
             'uuid', 'name', 'slug', 'active', 'site', 'enable_data_sharing_consent',
             'enforce_data_sharing_consent', 'branding_configuration', 'enterprise_customer_entitlements',
             'identity_provider', 'enable_audit_enrollment', 'replace_sensitive_sso_username',
-            'enable_portal_code_management_screen', 'sync_learner_profile_data',
+            'enable_portal_code_management_screen', 'sync_learner_profile_data', 'enable_audit_data_reporting'
         )
 
     site = SiteSerializer()

diff --git a/tests/test_enterprise/api/test_views.py b/tests/test_enterprise/api/test_views.py
@@ -495,15 +495,15 @@ def test_post_enterprise_customer_user_logged_out(self):
             [{
                 'uuid': FAKE_UUIDS[0], 'name': 'Test Enterprise Customer', 'slug': TEST_SLUG,
                 'active': True, 'enable_data_sharing_consent': True,
-                'enforce_data_sharing_consent': 'at_enrollment',
+                'enforce_data_sharing_consent': 'at_enrollment', 'enable_audit_data_reporting': True,
                 'site__domain': 'example.com', 'site__name': 'example.com',
             }],
             [{
                 'uuid': FAKE_UUIDS[0], 'name': 'Test Enterprise Customer', 'slug': TEST_SLUG,
                 'active': True, 'enable_data_sharing_consent': True,
                 'enforce_data_sharing_consent': 'at_enrollment',
                 'branding_configuration': None, 'enterprise_customer_entitlements': [],
-                'enable_audit_enrollment': False, 'identity_provider': None,
+                'enable_audit_enrollment': False, 'enable_audit_data_reporting': True, 'identity_provider': None,
                 'replace_sensitive_sso_username': False, 'enable_portal_code_management_screen': False,
                 'site': {
                     'domain': 'example.com', 'name': 'example.com'
@@ -535,6 +535,7 @@ def test_post_enterprise_customer_user_logged_out(self):
                     'branding_configuration': None, 'enterprise_customer_entitlements': [],
                     'enable_audit_enrollment': False, 'identity_provider': None,
                     'replace_sensitive_sso_username': False, 'enable_portal_code_management_screen': False,
+                    'enable_audit_data_reporting': False,
                     'site': {
                         'domain': 'example.com', 'name': 'example.com'
                     },
@@ -590,6 +591,7 @@ def test_post_enterprise_customer_user_logged_out(self):
                 'branding_configuration': None, 'enterprise_customer_entitlements': [],
                 'enable_audit_enrollment': False, 'identity_provider': FAKE_UUIDS[0],
                 'replace_sensitive_sso_username': False, 'enable_portal_code_management_screen': False,
+                'enable_audit_data_reporting': False,
                 'site': {
                     'domain': 'example.com', 'name': 'example.com'
                 },
@@ -757,7 +759,7 @@ def test_enterprise_customer_with_access_to(
                 'active': True, 'enable_data_sharing_consent': True,
                 'enforce_data_sharing_consent': 'at_enrollment',
                 'branding_configuration': None, 'enterprise_customer_entitlements': [],
-                'enable_audit_enrollment': False, 'identity_provider': None,
+                'enable_audit_enrollment': False, 'enable_audit_data_reporting': False, 'identity_provider': None,
                 'replace_sensitive_sso_username': False, 'enable_portal_code_management_screen': True,
                 'site': {
                     'domain': 'example.com', 'name': 'example.com'