From eb71ee950df10111910c68b76ec75e991d9dbc42 Mon Sep 17 00:00:00 2001 From: Louis Chemineau Date: Wed, 5 Jul 2023 15:52:13 +0200 Subject: [PATCH 1/5] Enable all files versions features when groupfolders is enabled Signed-off-by: Louis Chemineau --- apps/files_versions/lib/Capabilities.php | 6 ++---- apps/files_versions/src/components/Version.vue | 14 ++++++++++++-- dist/files_versions-files_versions.js | 4 ++-- dist/files_versions-files_versions.js.map | 2 +- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/apps/files_versions/lib/Capabilities.php b/apps/files_versions/lib/Capabilities.php index 6439c18772b51..b5861db89376f 100644 --- a/apps/files_versions/lib/Capabilities.php +++ b/apps/files_versions/lib/Capabilities.php @@ -44,13 +44,11 @@ public function __construct( * Return this classes capabilities */ public function getCapabilities() { - $groupFolderInstalled = $this->appManager->isInstalled('groupfolders'); - return [ 'files' => [ 'versioning' => true, - 'version_labeling' => !$groupFolderInstalled && $this->config->getSystemValueBool('enable_version_labeling', true), - 'version_deletion' => !$groupFolderInstalled && $this->config->getSystemValueBool('enable_version_deletion', true), + 'version_labeling' => $this->config->getSystemValueBool('enable_version_labeling', true), + 'version_deletion' => $this->config->getSystemValueBool('enable_version_deletion', true), ] ]; } diff --git a/apps/files_versions/src/components/Version.vue b/apps/files_versions/src/components/Version.vue index ec03a1c2b31ee..8c7296fbb250b 100644 --- a/apps/files_versions/src/components/Version.vue +++ b/apps/files_versions/src/components/Version.vue @@ -46,7 +46,7 @@