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

Merge pull request #24864 from nextcloud/bugfix/noid/always-show-external-share 

Also include external share results in recommendations
This commit is contained in:
Julius Härtl 2020-12-30 17:40:58 +01:00 committed by GitHub
parent 40832acfd5 9f5ada5d45
commit 5e3fe1cbfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 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

3
apps/files_sharing/src/components/SharingInput.vue
View File

@ -294,6 +294,8 @@ export default {
return return
} }
const externalResults = this.externalResults.filter(result => !result.condition || result.condition(this))
const exact = request.data.ocs.data.exact const exact = request.data.ocs.data.exact
// flatten array of arrays // flatten array of arrays
@ -302,6 +304,7 @@ export default {
// remove invalid data and format to user-select layout // remove invalid data and format to user-select layout
this.recommendations = this.filterOutExistingShares(rawRecommendations) this.recommendations = this.filterOutExistingShares(rawRecommendations)
.map(share => this.formatForMultiselect(share)) .map(share => this.formatForMultiselect(share))
.concat(externalResults)
this.loading = false this.loading = false
console.info('recommendations', this.recommendations) console.info('recommendations', this.recommendations)