Browse Source

Fix SharingInput Multiselect

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
tags/v22.0.0beta1
John Molakvoæ (skjnldsv) 3 years ago
parent
commit
31ddfb0294
No account linked to committer's email address

+ 1
- 1
apps/files_sharing/js/dist/files_sharing_tab.js
File diff suppressed because it is too large
View File


+ 1
- 1
apps/files_sharing/js/dist/files_sharing_tab.js.map
File diff suppressed because it is too large
View File


+ 10
- 6
apps/files_sharing/src/components/SharingInput.vue View File

@@ -35,6 +35,8 @@
:searchable="true"
:user-select="true"
open-direction="below"
label="displayName"
track-by="id"
@search-change="asyncFind"
@select="addShare">
<template #noOptions>
@@ -233,6 +235,7 @@ export default {
const lookupEntry = []
if (data.lookupEnabled && !lookup) {
lookupEntry.push({
id: 'global-lookup',
isNoUser: true,
displayName: t('files_sharing', 'Search globally'),
lookup: true,
@@ -404,26 +407,27 @@ export default {
* @returns {Object}
*/
formatForMultiselect(result) {
let desc
let subtitle
if (result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_USER && this.config.shouldAlwaysShowUnique) {
desc = result.shareWithDisplayNameUnique ?? ''
subtitle = 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) {
desc = t('files_sharing', 'on {server}', { server: result.value.server })
subtitle = t('files_sharing', 'on {server}', { server: result.value.server })
} else if (result.value.shareType === this.SHARE_TYPES.SHARE_TYPE_EMAIL) {
desc = result.value.shareWith
subtitle = result.value.shareWith
} else {
desc = result.shareWithDescription ?? ''
subtitle = result.shareWithDescription ?? ''
}

return {
id: `${result.value.shareType}-${result.value.shareWith}`,
shareWith: result.value.shareWith,
shareType: result.value.shareType,
user: result.uuid || result.value.shareWith,
isNoUser: result.value.shareType !== this.SHARE_TYPES.SHARE_TYPE_USER,
displayName: result.name || result.label,
desc,
subtitle,
shareWithDisplayNameUnique: result.shareWithDisplayNameUnique || '',
icon: this.shareTypeToIcon(result.value.shareType),
}

+ 10
- 1
apps/files_sharing/src/models/Share.js View File

@@ -150,8 +150,17 @@ export default class Share {
|| this.#share.share_with
}

/**
* Unique display name in case of multiple
* duplicates results with the same name.
*
* @returns {string}
* @readonly
* @memberof Share
*/
get shareWithDisplayNameUnique() {
return this.#share.share_with_displayname_unique || this.#share.share_with
return this.#share.share_with_displayname_unique
|| this.#share.share_with
}

/**

+ 0
- 2
apps/settings/js/vue-settings-apps-53ebd5109b417caf3351.js
File diff suppressed because it is too large
View File


+ 0
- 1
apps/settings/js/vue-settings-apps-53ebd5109b417caf3351.js.map
File diff suppressed because it is too large
View File


+ 0
- 2
apps/settings/js/vue-settings-users-961f28f8e8f7699aa569.js
File diff suppressed because it is too large
View File


+ 0
- 1
apps/settings/js/vue-settings-users-961f28f8e8f7699aa569.js.map
File diff suppressed because it is too large
View File


+ 0
- 2
apps/settings/js/vue-vendors-settings-apps-b8832926335a405dfc1b.js
File diff suppressed because it is too large
View File


+ 0
- 1
apps/settings/js/vue-vendors-settings-apps-b8832926335a405dfc1b.js.map
File diff suppressed because it is too large
View File


+ 0
- 2
apps/settings/js/vue-vendors-settings-apps-settings-users-e36e32b57c4d1f61dbef.js
File diff suppressed because it is too large
View File


+ 0
- 1
apps/settings/js/vue-vendors-settings-apps-settings-users-e36e32b57c4d1f61dbef.js.map
File diff suppressed because it is too large
View File


+ 0
- 2
apps/settings/js/vue-vendors-settings-users-c29103897453b0353c77.js
File diff suppressed because it is too large
View File


+ 0
- 1
apps/settings/js/vue-vendors-settings-users-c29103897453b0353c77.js.map
File diff suppressed because it is too large
View File


Loading…
Cancel
Save