summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/src/views/SharingTab.vue
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2019-11-27 18:11:33 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2019-12-03 08:13:21 +0100
commit3a86b9925693fbcbaf0adb64a8d85500f055ef38 (patch)
tree2138ba06a5175bca070ecf2da021905469562c50 /apps/files_sharing/src/views/SharingTab.vue
parentccf7d87c11112b63851940a6b157f07f954bd9ef (diff)
downloadnextcloud-server-3a86b9925693fbcbaf0adb64a8d85500f055ef38.tar.gz
nextcloud-server-3a86b9925693fbcbaf0adb64a8d85500f055ef38.zip
Inherited share UI
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/files_sharing/src/views/SharingTab.vue')
-rw-r--r--apps/files_sharing/src/views/SharingTab.vue11
1 files changed, 8 insertions, 3 deletions
diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue
index 216b2e74ffc..b15ec5e9a64 100644
--- a/apps/files_sharing/src/views/SharingTab.vue
+++ b/apps/files_sharing/src/views/SharingTab.vue
@@ -33,7 +33,7 @@
<!-- shared with me information -->
<SharingEntrySimple v-if="isSharedWithMe" v-bind="sharedWithMe" class="sharing-entry__reshare">
<template #avatar>
- <Avatar #avatar
+ <Avatar
:user="sharedWithMe.user"
:display-name="sharedWithMe.displayName"
class="sharing-entry__avatar"
@@ -61,6 +61,9 @@
:shares="shares"
:file-info="fileInfo" />
+ <!-- inherited shares -->
+ <SharingInherited v-if="!loading" :file-info="fileInfo" />
+
<!-- internal link copy -->
<SharingEntryInternal :file-info="fileInfo" />
@@ -82,11 +85,11 @@
</template>
<script>
+import { CollectionList } from 'nextcloud-vue-collections'
import { generateOcsUrl } from '@nextcloud/router'
-import Tab from 'nextcloud-vue/dist/Components/AppSidebarTab'
import Avatar from 'nextcloud-vue/dist/Components/Avatar'
import axios from '@nextcloud/axios'
-import { CollectionList } from 'nextcloud-vue-collections'
+import Tab from 'nextcloud-vue/dist/Components/AppSidebarTab'
import { shareWithTitle } from '../utils/SharedWithMe'
import Share from '../models/Share'
@@ -95,6 +98,7 @@ import SharingEntryInternal from '../components/SharingEntryInternal'
import SharingEntrySimple from '../components/SharingEntrySimple'
import SharingInput from '../components/SharingInput'
+import SharingInherited from './SharingInherited'
import SharingLinkList from './SharingLinkList'
import SharingList from './SharingList'
@@ -106,6 +110,7 @@ export default {
CollectionList,
SharingEntryInternal,
SharingEntrySimple,
+ SharingInherited,
SharingInput,
SharingLinkList,
SharingList,