From: Joas Schilling <coding@schilljs.com>
Date: Wed, 10 Mar 2021 14:17:36 +0000 (+0100)
Subject: Add a hint that the settings are OR based
X-Git-Tag: v21.0.1RC1~72^2~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8069c52a85e9b11836225d542b449fff3906e765;p=nextcloud-server.git

Add a hint that the settings are OR based

Signed-off-by: Joas Schilling <coding@schilljs.com>
---

diff --git a/apps/settings/js/admin.js b/apps/settings/js/admin.js
index 72b167d7e0d..ba6b480c79d 100644
--- a/apps/settings/js/admin.js
+++ b/apps/settings/js/admin.js
@@ -145,6 +145,7 @@ window.addEventListener('DOMContentLoaded', function(){
 	$('#shareapi_allow_share_dialog_user_enumeration').on('change', function() {
 		$('#shareapi_restrict_user_enumeration_to_group_setting').toggleClass('hidden', !this.checked);
 		$('#shareapi_restrict_user_enumeration_to_phone_setting').toggleClass('hidden', !this.checked);
+		$('#shareapi_restrict_user_enumeration_combinewarning_setting').toggleClass('hidden', !this.checked);
 	})
 
 	$('#allowLinks').change(function() {
diff --git a/apps/settings/templates/settings/admin/sharing.php b/apps/settings/templates/settings/admin/sharing.php
index b02a7d2764c..a72bf0bd590 100644
--- a/apps/settings/templates/settings/admin/sharing.php
+++ b/apps/settings/templates/settings/admin/sharing.php
@@ -185,6 +185,11 @@
 } ?> />
 		<label for="shareapi_restrict_user_enumeration_to_phone"><?php p($l->t('Allow username autocompletion to users based on phonebook matches'));?></label><br />
 	</p>
+	<p id="shareapi_restrict_user_enumeration_combinewarning_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no' || $_['allowShareDialogUserEnumeration'] === 'no') {
+	p('hidden');
+}?>">
+		<em><?php p($l->t('If autocompletion "same group" and "phonebook matches" are enabled a match in either is enough to show the user.'));?></em><br />
+	</p>
 
 	<p>
 		<input type="checkbox" id="publicShareDisclaimer" class="checkbox noJSAutoUpdate"