diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-06-04 01:28:22 +0200 |
|---|---|---|
| committer | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-09-06 03:38:47 +0200 |
| commit | 82a7a3971dff8f89d5292b16253b4e8266c42cd5 (patch) | |
| tree | 9e1ed64b1a4940d94c053757dca9268578302946 /apps/files/src | |
| parent | 819f5cea9bfaded7fe0d177eefa13e5e1e30a552 (diff) | |
| download | nextcloud-server-82a7a3971dff8f89d5292b16253b4e8266c42cd5.tar.gz nextcloud-server-82a7a3971dff8f89d5292b16253b4e8266c42cd5.zip | |
fix(files): Adjust files list for sharing permissions on public shares
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Diffstat (limited to 'apps/files/src')
| -rw-r--r-- | apps/files/src/FilesApp.vue | 13 | ||||
| -rw-r--r-- | apps/files/src/views/FilesList.vue | 16 |
2 files changed, 25 insertions, 4 deletions
diff --git a/apps/files/src/FilesApp.vue b/apps/files/src/FilesApp.vue index 73a14a157b4..bee4205264b 100644 --- a/apps/files/src/FilesApp.vue +++ b/apps/files/src/FilesApp.vue @@ -4,12 +4,13 @@ --> <template> <NcContent app-name="files"> - <Navigation /> - <FilesList /> + <Navigation v-if="!isPublic" /> + <FilesList :is-public="isPublic" /> </NcContent> </template> <script lang="ts"> +import { isPublicShare } from '@nextcloud/sharing/public' import { defineComponent } from 'vue' import NcContent from '@nextcloud/vue/dist/Components/NcContent.js' @@ -25,5 +26,13 @@ export default defineComponent({ FilesList, Navigation, }, + + setup() { + const isPublic = isPublicShare() + + return { + isPublic, + } + }, }) </script> diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue index 70c9a38607e..75d25e2a492 100644 --- a/apps/files/src/views/FilesList.vue +++ b/apps/files/src/views/FilesList.vue @@ -4,7 +4,7 @@ --> <template> <NcAppContent :page-heading="pageHeading" data-cy-files-content> - <div class="files-list__header"> + <div class="files-list__header" :class="{ 'files-list__header--public': isPublic }"> <!-- Current folder breadcrumbs --> <BreadCrumbs :path="directory" @reload="fetchContent"> <template #actions> @@ -189,6 +189,13 @@ export default defineComponent({ filesSortingMixin, ], + props: { + isPublic: { + type: Boolean, + default: false, + }, + }, + setup() { const filesStore = useFilesStore() const filtersStore = useFiltersStore() @@ -393,7 +400,7 @@ export default defineComponent({ * Check if current folder has share permissions */ canShare() { - return isSharingEnabled + return isSharingEnabled && !this.isPublic && this.currentFolder && (this.currentFolder.permissions & Permission.SHARE) !== 0 }, @@ -682,6 +689,11 @@ export default defineComponent({ margin-block: var(--app-navigation-padding, 4px); margin-inline: calc(var(--default-clickable-area, 44px) + 2 * var(--app-navigation-padding, 4px)) var(--app-navigation-padding, 4px); + &--public { + // There is no navigation toggle on public shares + margin-inline: 0 var(--app-navigation-padding, 4px); + } + >* { // Do not grow or shrink (horizontally) // Only the breadcrumbs shrinks |