summaryrefslogtreecommitdiffstats
path: root/apps/files_versions
diff options
context:
space:
mode:
authorLouis Chemineau <louis@chmn.me>2023-07-05 15:52:13 +0200
committerLouis Chemineau <louis@chmn.me>2023-07-10 11:51:14 +0200
commite7d543278297fd8b119f768e0d7a6d2fe48b7c88 (patch)
tree2d151770ea44e8d4ab09f6d4b0ec2940a2117110 /apps/files_versions
parent0a876e3ac8138dc8d4734a2491284798c300fdd6 (diff)
downloadnextcloud-server-e7d543278297fd8b119f768e0d7a6d2fe48b7c88.tar.gz
nextcloud-server-e7d543278297fd8b119f768e0d7a6d2fe48b7c88.zip
Enable all files versions features when groupfolders is enabled
Signed-off-by: Louis Chemineau <louis@chmn.me>
Diffstat (limited to 'apps/files_versions')
-rw-r--r--apps/files_versions/lib/Capabilities.php6
-rw-r--r--apps/files_versions/src/components/Version.vue14
2 files changed, 14 insertions, 6 deletions
diff --git a/apps/files_versions/lib/Capabilities.php b/apps/files_versions/lib/Capabilities.php
index afc6fa39da7..411a47f6c4a 100644
--- a/apps/files_versions/lib/Capabilities.php
+++ b/apps/files_versions/lib/Capabilities.php
@@ -46,13 +46,11 @@ class Capabilities implements ICapability {
* @return array
*/
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 a801c6beac8..93dfb95b8b7 100644
--- a/apps/files_versions/src/components/Version.vue
+++ b/apps/files_versions/src/components/Version.vue
@@ -46,7 +46,7 @@
</div>
</template>
<template #actions>
- <NcActionButton v-if="capabilities.files.version_labeling === true"
+ <NcActionButton v-if="enableLabeling"
:close-after-click="true"
@click="openVersionLabelModal">
<template #icon>
@@ -70,7 +70,7 @@
</template>
{{ t('files_versions', 'Download version') }}
</NcActionLink>
- <NcActionButton v-if="!isCurrent && capabilities.files.version_deletion === true"
+ <NcActionButton v-if="!isCurrent && enableDeletion"
:close-after-click="true"
@click="deleteVersion">
<template #icon>
@@ -244,6 +244,16 @@ export default {
formattedDate() {
return moment(this.version.mtime).format('LLL')
},
+
+ /** @return {boolean} */
+ enableLabeling() {
+ return this.capabilities.files.version_labeling === true && this.fileInfo.mountType !== 'group'
+ },
+
+ /** @return {boolean} */
+ enableDeletion() {
+ return this.capabilities.files.version_deletion === true && this.fileInfo.mountType !== 'group'
+ }
},
methods: {
openVersionLabelModal() {