aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/src/components/SharingInput.vue
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2020-12-30 17:40:58 +0100
committerGitHub <noreply@github.com>2020-12-30 17:40:58 +0100
commit5e3fe1cbfe5e47ebdd604bc1064726d47207d19d (patch)
tree3e9bb9d2eba4df4628f51bbc0c614bd31b6b67f6 /apps/files_sharing/src/components/SharingInput.vue
parent40832acfd55090c7cc4b2d088743601b9fb0161f (diff)
parent9f5ada5d458429f18d891bfd1e4621330163de65 (diff)
downloadnextcloud-server-5e3fe1cbfe5e47ebdd604bc1064726d47207d19d.tar.gz
nextcloud-server-5e3fe1cbfe5e47ebdd604bc1064726d47207d19d.zip
Merge pull request #24864 from nextcloud/bugfix/noid/always-show-external-share
Also include external share results in recommendations
Diffstat (limited to 'apps/files_sharing/src/components/SharingInput.vue')
-rw-r--r--apps/files_sharing/src/components/SharingInput.vue3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue
index 4222a5589e6..9fa9e47e287 100644
--- a/apps/files_sharing/src/components/SharingInput.vue
+++ b/apps/files_sharing/src/components/SharingInput.vue
@@ -294,6 +294,8 @@ export default {
return
}
+ const externalResults = this.externalResults.filter(result => !result.condition || result.condition(this))
+
const exact = request.data.ocs.data.exact
// flatten array of arrays
@@ -302,6 +304,7 @@ export default {
// remove invalid data and format to user-select layout
this.recommendations = this.filterOutExistingShares(rawRecommendations)
.map(share => this.formatForMultiselect(share))
+ .concat(externalResults)
this.loading = false
console.info('recommendations', this.recommendations)