From e08bf1f4b0f39757d3b079ec742fe53fde26eb32 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Mon, 2 Sep 2024 09:55:32 +0200 Subject: [PATCH] fix(settings): Fix sharing exclude groups from password requirement option not working Signed-off-by: provokateurin Signed-off-by: nextcloud-command --- apps/settings/lib/Settings/Admin/Sharing.php | 4 ++-- apps/settings/src/components/AdminSettingsSharingForm.vue | 8 ++++---- apps/settings/tests/Settings/Admin/SharingTest.php | 8 ++++---- dist/settings-vue-settings-admin-sharing.js | 4 ++-- dist/settings-vue-settings-admin-sharing.js.map | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/settings/lib/Settings/Admin/Sharing.php b/apps/settings/lib/Settings/Admin/Sharing.php index ec9dc0ddfd1cb..5e8d9498767b3 100644 --- a/apps/settings/lib/Settings/Admin/Sharing.php +++ b/apps/settings/lib/Settings/Admin/Sharing.php @@ -81,8 +81,8 @@ public function getForm() { 'restrictUserEnumerationFullMatchEmail' => $this->getHumanBooleanConfig('core', 'shareapi_restrict_user_enumeration_full_match_email', true), 'restrictUserEnumerationFullMatchIgnoreSecondDN' => $this->getHumanBooleanConfig('core', 'shareapi_restrict_user_enumeration_full_match_ignore_second_dn'), 'enforceLinksPassword' => Util::isPublicLinkPasswordRequired(false), - 'passwordExcludedGroups' => json_decode($excludedPasswordGroups) ?? [], - 'passwordExcludedGroupsFeatureEnabled' => $this->config->getSystemValueBool('sharing.allow_disabled_password_enforcement_groups', false), + 'enforceLinksPasswordExcludedGroups' => json_decode($excludedPasswordGroups) ?? [], + 'enforceLinksPasswordExcludedGroupsEnabled' => $this->config->getSystemValueBool('sharing.allow_disabled_password_enforcement_groups', false), 'onlyShareWithGroupMembers' => $this->shareManager->shareWithGroupMembersOnly(), 'onlyShareWithGroupMembersExcludeGroupList' => json_decode($onlyShareWithGroupMembersExcludeGroupList) ?? [], 'defaultExpireDate' => $this->getHumanBooleanConfig('core', 'shareapi_default_expire_date'), diff --git a/apps/settings/src/components/AdminSettingsSharingForm.vue b/apps/settings/src/components/AdminSettingsSharingForm.vue index 6842f7cbe9337..d1eab1a63df8a 100644 --- a/apps/settings/src/components/AdminSettingsSharingForm.vue +++ b/apps/settings/src/components/AdminSettingsSharingForm.vue @@ -62,9 +62,9 @@ {{ t('settings', 'Enforce password protection') }} -