aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/src
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2020-10-22 12:12:48 +0200
committernpmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>2020-10-23 11:48:23 +0000
commitf0c47bfb6d8d348972ae7c2b4aa0411617864faf (patch)
tree56e0b82ada286bdf1eecc6529219adeecfe80449 /apps/files_sharing/src
parent38bb40cffa6f0302efa134a347bd876e257495c1 (diff)
downloadnextcloud-server-f0c47bfb6d8d348972ae7c2b4aa0411617864faf.tar.gz
nextcloud-server-f0c47bfb6d8d348972ae7c2b4aa0411617864faf.zip
Fix sharing input placeholder for emails
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
Diffstat (limited to 'apps/files_sharing/src')
-rw-r--r--apps/files_sharing/src/components/SharingInput.vue14
1 files changed, 4 insertions, 10 deletions
diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue
index 104ffb1699c..06b39db4fcb 100644
--- a/apps/files_sharing/src/components/SharingInput.vue
+++ b/apps/files_sharing/src/components/SharingInput.vue
@@ -117,22 +117,16 @@ export default {
},
inputPlaceholder() {
const allowRemoteSharing = this.config.isRemoteShareAllowed
- const allowMailSharing = this.config.isMailShareAllowed
if (!this.canReshare) {
return t('files_sharing', 'Resharing is not allowed')
}
- if (!allowRemoteSharing && allowMailSharing) {
- return t('files_sharing', 'Name or email address …')
- }
- if (allowRemoteSharing && !allowMailSharing) {
- return t('files_sharing', 'Name or federated cloud ID …')
- }
- if (allowRemoteSharing && allowMailSharing) {
- return t('files_sharing', 'Name, federated cloud ID or email address …')
+ // We can always search with email addresses for users too
+ if (!allowRemoteSharing) {
+ return t('files_sharing', 'Name or email …')
}
- return t('files_sharing', 'Name …')
+ return t('files_sharing', 'Name, email, or federated cloud ID …')
},
isValidQuery() {