Skip to content

Commit 73d85c1

Browse files
authored
Merge pull request #55642 from nextcloud/backport/55080/stable32
[stable32] fix(sharing): Adapt share suggestions to match trusted servers configs
2 parents 9f1027b + 35c7690 commit 73d85c1

File tree

12 files changed

+130
-25
lines changed

12 files changed

+130
-25
lines changed

apps/files_sharing/src/components/SharingInput.vue

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,20 @@ export default {
457457
}
458458
},
459459
460+
/**
461+
* Filter suggestion results based on trusted server configuration
462+
*
463+
* @param {object} result The raw suggestion result from API
464+
* @return {boolean} Whether to include this result in suggestions
465+
*/
466+
filterByTrustedServer(result) {
467+
const isRemoteEntity = result.value.shareType === ShareType.Remote || result.value.shareType === ShareType.RemoteGroup
468+
if (isRemoteEntity && this.config.showFederatedSharesToTrustedServersAsInternal) {
469+
return result.value.isTrustedServer === true
470+
}
471+
return true
472+
},
473+
460474
/**
461475
* Format shares for the multiselect options
462476
*

dist/7846-7846.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

dist/7846-7846.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/7846-7846.js.map.license

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/8465-8465.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/8465-8465.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/8465-8465.js.map.license

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8465-8465.js.license

dist/files_sharing-files_sharing_tab.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files_sharing-files_sharing_tab.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)