mirror of
https://github.com/nextcloud/server.git
synced 2026-03-21 18:11:02 -04:00
Merge pull request #46983 from nextcloud/backport/46591/stable29
This commit is contained in:
commit
3cd47a49dd
8 changed files with 13 additions and 13 deletions
|
|
@ -438,17 +438,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 {
|
||||
|
|
@ -457,7 +457,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),
|
||||
}
|
||||
|
|
|
|||
3
dist/4605-4605.js
vendored
3
dist/4605-4605.js
vendored
File diff suppressed because one or more lines are too long
1
dist/4605-4605.js.map
vendored
1
dist/4605-4605.js.map
vendored
File diff suppressed because one or more lines are too long
3
dist/6475-6475.js
vendored
Normal file
3
dist/6475-6475.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
dist/6475-6475.js.map
vendored
Normal file
1
dist/6475-6475.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
4
dist/files_sharing-files_sharing_tab.js
vendored
4
dist/files_sharing-files_sharing_tab.js
vendored
File diff suppressed because one or more lines are too long
2
dist/files_sharing-files_sharing_tab.js.map
vendored
2
dist/files_sharing-files_sharing_tab.js.map
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue