Skip to content

fix(files_sharing): show shares to remote as internal if configured so #54360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
susnux merged 2 commits into from
Aug 11, 2025
Merged

fix(files_sharing): show shares to remote as internal if configured so #54360

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cbfe61
fix(files_sharing): show shares to remote as internal if configured so
susnux Aug 11, 2025
6001eba
chore(assets): Recompile assets
nextcloud-command Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(files_sharing): show shares to remote as internal if configured so 
- if this is a GS instance
- or was configured by administrator

Then show the share as internal (remote and remote group shares).

Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
@susnux @nextcloud-command
susnux authored and nextcloud-command committed Aug 11, 2025
commit 5cbfe61b182962b54f5a4f7171fccd042903f38c
15 changes: 10 additions & 5 deletions apps/files_sharing/src/components/SharingEntry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@
:href="share.shareWithLink"
class="sharing-entry__summary__desc">
<span>{{ title }}
<span v-if="!isUnique" class="sharing-entry__summary__desc-unique"> ({{
share.shareWithDisplayNameUnique }})</span>
<span v-if="!isUnique" class="sharing-entry__summary__desc-unique">
({{ share.shareWithDisplayNameUnique }})
</span>
<small v-if="hasStatus && share.status.message">({{ share.status.message }})</small>
</span>
</component>
Expand Down Expand Up @@ -73,13 +74,17 @@ export default {
computed: {
title() {
let title = this.share.shareWithDisplayName
if (this.share.type === ShareType.Group) {

const showAsInternal = this.config.showFederatedSharesAsInternal
|| (this.share.isTrustedServer && this.config.showFederatedSharesToTrustedServersAsInternal)

if (this.share.type === ShareType.Group || (this.share.type === ShareType.RemoteGroup && showAsInternal)) {
title += ` (${t('files_sharing', 'group')})`
} else if (this.share.type === ShareType.Room) {
title += ` (${t('files_sharing', 'conversation')})`
} else if (this.share.type === ShareType.Remote && !this.share.isTrustedServer) {
} else if (this.share.type === ShareType.Remote && !showAsInternal) {
title += ` (${t('files_sharing', 'remote')})`
} else if (this.share.type === ShareType.RemoteGroup && !this.share.isTrustedServer) {
} else if (this.share.type === ShareType.RemoteGroup) {
title += ` (${t('files_sharing', 'remote group')})`
} else if (this.share.type === ShareType.Guest) {
title += ` (${t('files_sharing', 'guest')})`
Expand Down