Browse Source

Merge pull request #54360 from nextcloud/fix/display-shares-as-internal

fix(files_sharing): show shares to remote as internal if configured so
pull/54310/head
Ferdinand Thiessen 4 months ago
committed by GitHub
parent
commit
2e7ac880bb
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 15
      apps/files_sharing/src/components/SharingEntry.vue
  2. 2
      dist/2261-2261.js
  3. 0
      dist/2261-2261.js.license
  4. 1
      dist/2261-2261.js.map
  5. 1
      dist/2261-2261.js.map.license
  6. 2
      dist/910-910.js
  7. 1
      dist/910-910.js.map
  8. 1
      dist/910-910.js.map.license
  9. 4
      dist/files_sharing-files_sharing_tab.js
  10. 2
      dist/files_sharing-files_sharing_tab.js.map

15
apps/files_sharing/src/components/SharingEntry.vue

@ -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
File diff suppressed because it is too large
View File

0
dist/910-910.js.license → dist/2261-2261.js.license

1
dist/2261-2261.js.map
File diff suppressed because it is too large
View File

1
dist/2261-2261.js.map.license

@ -0,0 +1 @@
2261-2261.js.license

2
dist/910-910.js
File diff suppressed because it is too large
View File

1
dist/910-910.js.map
File diff suppressed because it is too large
View File

1
dist/910-910.js.map.license

@ -1 +0,0 @@
910-910.js.license

4
dist/files_sharing-files_sharing_tab.js
File diff suppressed because it is too large
View File

2
dist/files_sharing-files_sharing_tab.js.map
File diff suppressed because it is too large
View File

Loading…
Cancel
Save