diff options
| author | Louis <6653109+artonge@users.noreply.github.com> | 2022-06-27 11:58:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-27 11:58:54 +0200 |
| commit | 0fe7064fc4fbf15272031f852ffbdb6ac08bc6ef (patch) | |
| tree | 1805889478c85d5f24d12e1af98a4ad2dca0dad3 /apps | |
| parent | 069346b7d376e3149074657732eac0958317f8b8 (diff) | |
| parent | 347ca20f4e878a9800bc09b42674a492b5508d68 (diff) | |
| download | nextcloud-server-0fe7064fc4fbf15272031f852ffbdb6ac08bc6ef.tar.gz nextcloud-server-0fe7064fc4fbf15272031f852ffbdb6ac08bc6ef.zip | |
Merge pull request #32998 from nextcloud/fix/setting_name
Rename setting name to reduce its length
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/settings/lib/Settings/Admin/Sharing.php | 2 | ||||
| -rw-r--r-- | apps/settings/src/admin.js | 6 | ||||
| -rw-r--r-- | apps/settings/tests/Settings/Admin/SharingTest.php | 8 |
3 files changed, 5 insertions, 11 deletions
diff --git a/apps/settings/lib/Settings/Admin/Sharing.php b/apps/settings/lib/Settings/Admin/Sharing.php index ffe1e5acd45..d3c6839b8f7 100644 --- a/apps/settings/lib/Settings/Admin/Sharing.php +++ b/apps/settings/lib/Settings/Admin/Sharing.php @@ -91,7 +91,7 @@ class Sharing implements IDelegatedSettings { 'restrictUserEnumerationFullMatch' => $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match', 'yes'), 'restrictUserEnumerationFullMatchUserId' => $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes'), 'restrictUserEnumerationFullMatchEmail' => $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes'), - 'restrictUserEnumerationFullMatchIgnoreSecondDisplayName' => $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name', 'no'), + 'restrictUserEnumerationFullMatchIgnoreSecondDN' => $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no'), 'enforceLinkPassword' => Util::isPublicLinkPasswordRequired(false), 'passwordExcludedGroups' => $excludedPasswordGroupsList, 'passwordExcludedGroupsFeatureEnabled' => $this->config->getSystemValueBool('sharing.allow_disabled_password_enforcement_groups', false), diff --git a/apps/settings/src/admin.js b/apps/settings/src/admin.js index eadc91c1759..3ad922ed03f 100644 --- a/apps/settings/src/admin.js +++ b/apps/settings/src/admin.js @@ -139,12 +139,6 @@ window.addEventListener('DOMContentLoaded', () => { $('#shareapi_restrict_user_enumeration_combinewarning_setting').toggleClass('hidden', !this.checked) }) - $('#shareapi_restrict_user_enumeration_full_match').on('change', function() { - $('#shareapi_restrict_user_enumeration_full_match_userid_setting').toggleClass('hidden', !this.checked) - $('#shareapi_restrict_user_enumeration_full_match_email_setting').toggleClass('hidden', !this.checked) - $('#shareapi_restrict_user_enumeration_full_match_ignore_second_display_name_setting').toggleClass('hidden', !this.checked) - }) - $('#allowLinks').change(function() { $('#publicLinkSettings').toggleClass('hidden', !this.checked) $('#setDefaultExpireDate').toggleClass('hidden', !(this.checked && $('#shareapiDefaultExpireDate')[0].checked)) diff --git a/apps/settings/tests/Settings/Admin/SharingTest.php b/apps/settings/tests/Settings/Admin/SharingTest.php index 4cb94632f02..b238e888d39 100644 --- a/apps/settings/tests/Settings/Admin/SharingTest.php +++ b/apps/settings/tests/Settings/Admin/SharingTest.php @@ -85,7 +85,7 @@ class SharingTest extends TestCase { ['core', 'shareapi_restrict_user_enumeration_full_match', 'yes', 'yes'], ['core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes', 'yes'], ['core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes', 'yes'], - ['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name', 'no', 'no'], + ['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no', 'no'], ['core', 'shareapi_enabled', 'yes', 'yes'], ['core', 'shareapi_default_expire_date', 'no', 'no'], ['core', 'shareapi_expire_after_n_days', '7', '7'], @@ -121,7 +121,7 @@ class SharingTest extends TestCase { 'restrictUserEnumerationFullMatch' => 'yes', 'restrictUserEnumerationFullMatchUserId' => 'yes', 'restrictUserEnumerationFullMatchEmail' => 'yes', - 'restrictUserEnumerationFullMatchIgnoreSecondDisplayName' => 'no', + 'restrictUserEnumerationFullMatchIgnoreSecondDN' => 'no', 'enforceLinkPassword' => false, 'onlyShareWithGroupMembers' => false, 'shareAPIEnabled' => 'yes', @@ -166,7 +166,7 @@ class SharingTest extends TestCase { ['core', 'shareapi_restrict_user_enumeration_full_match', 'yes', 'yes'], ['core', 'shareapi_restrict_user_enumeration_full_match_userid', 'yes', 'yes'], ['core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes', 'yes'], - ['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_display_name', 'no', 'no'], + ['core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn', 'no', 'no'], ['core', 'shareapi_enabled', 'yes', 'yes'], ['core', 'shareapi_default_expire_date', 'no', 'no'], ['core', 'shareapi_expire_after_n_days', '7', '7'], @@ -202,7 +202,7 @@ class SharingTest extends TestCase { 'restrictUserEnumerationFullMatch' => 'yes', 'restrictUserEnumerationFullMatchUserId' => 'yes', 'restrictUserEnumerationFullMatchEmail' => 'yes', - 'restrictUserEnumerationFullMatchIgnoreSecondDisplayName' => 'no', + 'restrictUserEnumerationFullMatchIgnoreSecondDN' => 'no', 'enforceLinkPassword' => false, 'onlyShareWithGroupMembers' => false, 'shareAPIEnabled' => 'yes', |