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

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>
This commit is contained in:
John Molakvoæ (skjnldsv) 2020-10-22 12:12:48 +02:00 committed by npmbuildbot[bot]
parent 526a392002
commit 2562d45af2
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() {