aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorskjnldsv <skjnldsv@protonmail.com>2024-12-05 11:40:00 +0100
committerskjnldsv <skjnldsv@protonmail.com>2024-12-05 11:45:37 +0100
commit4afc3d52092a525033e8109f4e1e058a07ed2557 (patch)
treee3f5dd2c8512519bce4a03654dc42fad74f4c254
parent695c75a1b80b8d956c22972eda195333eee6d558 (diff)
downloadnextcloud-server-fix/restore-sucess.tar.gz
nextcloud-server-fix/restore-sucess.zip
fix(files_versions): fix missing labelfix/restore-sucess
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
-rw-r--r--apps/files_versions/src/components/Version.vue20
-rw-r--r--apps/files_versions/src/utils/versions.ts2
2 files changed, 15 insertions, 7 deletions
diff --git a/apps/files_versions/src/components/Version.vue b/apps/files_versions/src/components/Version.vue
index 177a9fef807..2ccd03bd8d4 100644
--- a/apps/files_versions/src/components/Version.vue
+++ b/apps/files_versions/src/components/Version.vue
@@ -209,20 +209,28 @@ export default defineComponent({
},
versionLabel(): string {
- const label = this.version.label ?? ''
+ const label = this.version?.label ?? ''
+ // Current but empty label
+ if (this.isCurrent && label === '') {
+ return t('files_versions', 'Current version')
+ }
+
+ // Current with label
if (this.isCurrent) {
- if (label === '') {
- return t('files_versions', 'Current version')
- } else {
- return `${label} (${t('files_versions', 'Current version')})`
- }
+ return `${label} (${t('files_versions', 'Current version')})`
}
+ // First version with empty label
if (this.isFirstVersion && label === '') {
return t('files_versions', 'Initial version')
}
+ // Unknown version with empty label
+ if (label === '') {
+ return t('files_versions', 'Unnamed version')
+ }
+
return label
},
diff --git a/apps/files_versions/src/utils/versions.ts b/apps/files_versions/src/utils/versions.ts
index b52f92ef462..567dfa72de2 100644
--- a/apps/files_versions/src/utils/versions.ts
+++ b/apps/files_versions/src/utils/versions.ts
@@ -18,7 +18,7 @@ import logger from '../utils/logger.js'
export interface Version {
fileId: string, // The id of the file associated to the version.
- label: string, // 'Current version' or ''
+ label?: string, // 'Current version' or ''
author: string|null, // UID for the author of the version
filename: string, // File name relative to the version DAV endpoint
basename: string, // A base name generated from the mtime