mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23646 from nextcloud/backport/23627/stable20 

[stable20] Fix sharing input placeholder for emails
This commit is contained in:
Roeland Jago Douma 2020-10-24 10:52:33 +02:00 committed by GitHub
parent 89d88b3ea5 2562d45af2
commit 0b67ea0d67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/js/dist/files_sharing_tab.js vendored
View File

File diff suppressed because one or more lines are too long

2
apps/files_sharing/js/dist/files_sharing_tab.js.map vendored
View File

File diff suppressed because one or more lines are too long

14
apps/files_sharing/src/components/SharingInput.vue
View File

@ -117,22 +117,16 @@ export default {
}, },
inputPlaceholder() { inputPlaceholder() {
const allowRemoteSharing = this.config.isRemoteShareAllowed const allowRemoteSharing = this.config.isRemoteShareAllowed
const allowMailSharing = this.config.isMailShareAllowed
if (!this.canReshare) { if (!this.canReshare) {
return t('files_sharing', 'Resharing is not allowed') return t('files_sharing', 'Resharing is not allowed')
} }
if (!allowRemoteSharing && allowMailSharing) { // We can always search with email addresses for users too
return t('files_sharing', 'Name or email address …') if (!allowRemoteSharing) {
} return t('files_sharing', 'Name or email …')
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 …')
} }
return t('files_sharing', 'Name …') return t('files_sharing', 'Name, email, or federated cloud ID …')
}, },
isValidQuery() { isValidQuery() {