diff options
author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2023-09-18 16:19:23 +0200 |
---|---|---|
committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2023-09-18 16:44:28 +0200 |
commit | ef1abd958c3aff7cfb56d83f5fb3b6c692845e17 (patch) | |
tree | 1f12667422033e260ebe978528a1ce064d53186c /apps/files | |
parent | fb30aa0902478b301fdfbb21af1df58effca459b (diff) | |
download | nextcloud-server-ef1abd958c3aff7cfb56d83f5fb3b6c692845e17.tar.gz nextcloud-server-ef1abd958c3aff7cfb56d83f5fb3b6c692845e17.zip |
fix(systemtags): fix capabilities and sidebar + tag visibility
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/files')
-rw-r--r-- | apps/files/src/actions/downloadAction.ts | 2 | ||||
-rw-r--r-- | apps/files/src/views/FilesList.vue | 3 | ||||
-rw-r--r-- | apps/files/src/views/Sidebar.vue | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/files/src/actions/downloadAction.ts b/apps/files/src/actions/downloadAction.ts index 9a3ae828cb6..ce9f22450e9 100644 --- a/apps/files/src/actions/downloadAction.ts +++ b/apps/files/src/actions/downloadAction.ts @@ -55,7 +55,7 @@ export const action = new FileAction({ // some folders, we need to use the /apps/files/ajax/download.php // endpoint, which only supports user root folder. if (nodes.some(node => node.type === FileType.Folder) - && !nodes.every(node => node.root?.startsWith('/files'))) { + && nodes.some(node => !node.root?.startsWith('/files'))) { return false } diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue index d08f5a11874..b7785e623b0 100644 --- a/apps/files/src/views/FilesList.vue +++ b/apps/files/src/views/FilesList.vue @@ -382,8 +382,7 @@ export default Vue.extend({ this.pathsStore.addPath({ service: currentView.id, fileid: node.fileid, path: join(dir, node.basename) }) }) } catch (error) { - throw error - // logger.error('Error while fetching content', { error }) + logger.error('Error while fetching content', { error }) } finally { this.loading = false } diff --git a/apps/files/src/views/Sidebar.vue b/apps/files/src/views/Sidebar.vue index 65e4c302632..b9804d7931e 100644 --- a/apps/files/src/views/Sidebar.vue +++ b/apps/files/src/views/Sidebar.vue @@ -91,6 +91,7 @@ import { emit } from '@nextcloud/event-bus' import { encodePath } from '@nextcloud/paths' import { File, Folder } from '@nextcloud/files' +import { getCapabilities } from '@nextcloud/capabilities' import { getCurrentUser } from '@nextcloud/auth' import { Type as ShareTypes } from '@nextcloud/sharing' import $ from 'jquery' @@ -299,7 +300,7 @@ export default { }, isSystemTagsEnabled() { - return OCA && 'SystemTags' in OCA + return getCapabilities()?.systemtags?.enabled === true }, }, created() { |