mirror of
https://github.com/nextcloud/server.git
synced 2026-05-28 04:32:30 -04:00
Merge pull request #54360 from nextcloud/fix/display-shares-as-internal
fix(files_sharing): show shares to remote as internal if configured so
This commit is contained in:
commit
2e7ac880bb
10 changed files with 17 additions and 12 deletions
|
|
@ -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>
|
||||
|
|
@ -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')})`
|
||||
|
|
|
|||
2
dist/2261-2261.js
vendored
Normal file
2
dist/2261-2261.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
dist/2261-2261.js.map
vendored
Normal file
1
dist/2261-2261.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
1
dist/2261-2261.js.map.license
vendored
Symbolic link
1
dist/2261-2261.js.map.license
vendored
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
2261-2261.js.license
|
||||
2
dist/910-910.js
vendored
2
dist/910-910.js
vendored
File diff suppressed because one or more lines are too long
1
dist/910-910.js.map
vendored
1
dist/910-910.js.map
vendored
File diff suppressed because one or more lines are too long
1
dist/910-910.js.map.license
vendored
1
dist/910-910.js.map.license
vendored
|
|
@ -1 +0,0 @@
|
|||
910-910.js.license
|
||||
4
dist/files_sharing-files_sharing_tab.js
vendored
4
dist/files_sharing-files_sharing_tab.js
vendored
File diff suppressed because one or more lines are too long
2
dist/files_sharing-files_sharing_tab.js.map
vendored
2
dist/files_sharing-files_sharing_tab.js.map
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue