Skip to content

Commit 0b67ea0

Browse files
authored
Merge pull request #23646 from nextcloud/backport/23627/stable20
[stable20] Fix sharing input placeholder for emails
2 parents 89d88b3 + 2562d45 commit 0b67ea0

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

apps/files_sharing/js/dist/files_sharing_tab.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files_sharing/js/dist/files_sharing_tab.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/files_sharing/src/components/SharingInput.vue

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -117,22 +117,16 @@ export default {
117117
},
118118
inputPlaceholder() {
119119
const allowRemoteSharing = this.config.isRemoteShareAllowed
120-
const allowMailSharing = this.config.isMailShareAllowed
121120
122121
if (!this.canReshare) {
123122
return t('files_sharing', 'Resharing is not allowed')
124123
}
125-
if (!allowRemoteSharing && allowMailSharing) {
126-
return t('files_sharing', 'Name or email address …')
127-
}
128-
if (allowRemoteSharing && !allowMailSharing) {
129-
return t('files_sharing', 'Name or federated cloud ID …')
130-
}
131-
if (allowRemoteSharing && allowMailSharing) {
132-
return t('files_sharing', 'Name, federated cloud ID or email address …')
124+
// We can always search with email addresses for users too
125+
if (!allowRemoteSharing) {
126+
return t('files_sharing', 'Name or email …')
133127
}
134128
135-
return t('files_sharing', 'Name …')
129+
return t('files_sharing', 'Name, email, or federated cloud ID')
136130
},
137131
138132
isValidQuery() {

0 commit comments

Comments
 (0)