Skip to content

Commit

Permalink
Merge pull request #46591 from nextcloud/fix/subtitle-on-search-for-s…
Browse files Browse the repository at this point in the history
…hare

fix(files_sharing): add missing subtitle on search for share recipients
  • Loading branch information
juliusknorr authored Aug 1, 2024
2 parents 1d147ac + a371101 commit 06b149c
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions apps/files_sharing/src/components/SharingInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -420,17 +420,17 @@ export default {
* @return {object}
*/
formatForMultiselect(result) {
let subtitle
let subname
if (result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_USER && this.config.shouldAlwaysShowUnique) {
subtitle = result.shareWithDisplayNameUnique ?? ''
subname = result.shareWithDisplayNameUnique ?? ''
} else if ((result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_REMOTE
|| result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_REMOTE_GROUP
) && result.value.server) {
subtitle = t('files_sharing', 'on {server}', { server: result.value.server })
subname = t('files_sharing', 'on {server}', { server: result.value.server })
} else if (result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_EMAIL) {
subtitle = result.value.shareWith
subname = result.value.shareWith
} else {
subtitle = result.shareWithDescription ?? ''
subname = result.shareWithDescription ?? ''
}
return {
Expand All @@ -439,7 +439,7 @@ export default {
user: result.uuid || result.value.shareWith,
isNoUser: result.value.shareType !== this.SHARE_TYPES.SHARE_TYPE_USER,
displayName: result.name || result.label,
subtitle,
subname,
shareWithDisplayNameUnique: result.shareWithDisplayNameUnique || '',
...this.shareTypeToIcon(result.value.shareType),
}
Expand Down
1 change: 0 additions & 1 deletion dist/2351-2351.js.map

This file was deleted.

1 change: 0 additions & 1 deletion dist/2351-2351.js.map.license

This file was deleted.

4 changes: 2 additions & 2 deletions dist/2351-2351.js → dist/9549-9549.js

Large diffs are not rendered by default.

File renamed without changes.
1 change: 1 addition & 0 deletions dist/9549-9549.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/9549-9549.js.map.license
4 changes: 2 additions & 2 deletions dist/files_sharing-files_sharing_tab.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files_sharing-files_sharing_tab.js.map

Large diffs are not rendered by default.

0 comments on commit 06b149c

Please sign in to comment.