diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-04-29 21:32:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-29 21:32:12 +0200 |
| commit | 8247576ad41b2eebab88a6cddf5e7f3db43a94e1 (patch) | |
| tree | 26558c3bcf653d48f6568c64272faee789034621 /apps/files_sharing/src/components/SharingEntryInherited.vue | |
| parent | 103c7e3e0aa6f9ef78666ea0ffb53d6781fd74a5 (diff) | |
| parent | d466a7b80834b6e31bfcb9d764816a01da0cbc7c (diff) | |
| download | nextcloud-server-8247576ad41b2eebab88a6cddf5e7f3db43a94e1.tar.gz nextcloud-server-8247576ad41b2eebab88a6cddf5e7f3db43a94e1.zip | |
Merge pull request #20262 from nextcloud/fix/others_with_acces/navigation
Allow to navigate to others with access from the sidebar
Diffstat (limited to 'apps/files_sharing/src/components/SharingEntryInherited.vue')
| -rw-r--r-- | apps/files_sharing/src/components/SharingEntryInherited.vue | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/apps/files_sharing/src/components/SharingEntryInherited.vue b/apps/files_sharing/src/components/SharingEntryInherited.vue index 259599359d4..b8b5674efc9 100644 --- a/apps/files_sharing/src/components/SharingEntryInherited.vue +++ b/apps/files_sharing/src/components/SharingEntryInherited.vue @@ -35,10 +35,10 @@ <ActionText icon="icon-user"> {{ t('files_sharing', 'Added by {initiator}', { initiator: share.ownerDisplayName }) }} </ActionText> - <ActionLink v-if="share.canDelete && share.fileSource" + <ActionLink v-if="share.viaPath && share.viaFileid" icon="icon-folder" - :href="fileTargetUrl"> - {{ t('files_sharing', 'Via folder') }} + :href="viaFileTargetUrl"> + {{ t('files_sharing', 'Via “{folder}”', {folder: viaFolderName} ) }} </ActionLink> <ActionButton v-if="share.canDelete" icon="icon-close" @@ -50,6 +50,7 @@ <script> import { generateUrl } from '@nextcloud/router' +import { basename } from '@nextcloud/paths' import Avatar from '@nextcloud/vue/dist/Components/Avatar' import ActionButton from '@nextcloud/vue/dist/Components/ActionButton' import ActionLink from '@nextcloud/vue/dist/Components/ActionLink' @@ -81,11 +82,15 @@ export default { }, computed: { - fileTargetUrl() { + viaFileTargetUrl() { return generateUrl('/f/{fileid}', { - fileid: this.share.fileSource, + fileid: this.share.viaFileid, }) }, + + viaFolderName() { + return basename(this.share.viaPath) + }, }, } </script> |