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

Merge branch 'master' into katrinan029/upgrade-edx-enterprise-a100166

Browse Source
This commit is contained in:
Katrina Nguyen
2024-09-30 13:57:39 -07:00
committed by GitHub
parent ad278df1c4 1beacdaf2c
commit 9970e5dbfc
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openedx/features/enterprise_support/tests/test_utils.py
View File

@@ -269,10 +269,11 @@ class TestEnterpriseUtils(TestCase):
mock_get_fields.assert_called_once_with(user)
assert expected_context == context
@ddt.data(settings.ENTERPRISE_READONLY_ACCOUNT_FIELDS, ['username', 'email', 'country'])
@mock.patch('openedx.features.enterprise_support.utils.get_current_request')
@mock.patch('openedx.features.enterprise_support.api.enterprise_customer_for_request')
def test_get_enterprise_readonly_account_fields_no_sync_learner_profile_data(
self, mock_customer_for_request, mock_get_current_request,
self, readonly_fields, mock_customer_for_request, mock_get_current_request,
):
mock_get_current_request.return_value = mock.Mock(
GET={'enterprise_customer': 'some-uuid'},
@@ -284,7 +285,8 @@ class TestEnterpriseUtils(TestCase):
}
user = mock.Mock()
actual_fields = get_enterprise_readonly_account_fields(user)
with override_settings(ENTERPRISE_READONLY_ACCOUNT_FIELDS=readonly_fields):
actual_fields = get_enterprise_readonly_account_fields(user)
assert set() == actual_fields
mock_customer_for_request.assert_called_once_with(mock_get_current_request.return_value)
mock_get_current_request.assert_called_once_with()

2
openedx/features/enterprise_support/utils.py
View File

@@ -277,7 +277,7 @@ def get_enterprise_readonly_account_fields(user):
# if user has no `UserSocialAuth` record then allow to edit `fullname`
# whether the `sync_learner_profile_data` is enabled or disabled
user_social_auth_record = _user_has_social_auth_record(user, enterprise_customer)
if not user_social_auth_record:
if not user_social_auth_record and 'name' in enterprise_readonly_account_fields:
enterprise_readonly_account_fields.remove('name')
sync_learner_profile_data = _get_sync_learner_profile_data(enterprise_customer)