Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions apps/files_versions/src/components/Version.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
},

Expand Down
2 changes: 1 addition & 1 deletion apps/files_versions/src/utils/versions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion apps/files_versions/src/views/VersionTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ export default {

try {
await restoreVersion(version)
if (version.label !== '') {
if (version?.label && version?.label !== '') {
showSuccess(t('files_versions', `${version.label} restored`))
} else if (version.mtime === this.initialVersionMtime) {
showSuccess(t('files_versions', 'Initial version restored'))
Expand Down
Loading