Skip to content

fix(files_versions): fix undefined success message #49664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
skjnldsv wants to merge 2 commits into from
Closed

fix(files_versions): fix undefined success message #49664

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
695c75a
fix(files_versions): fix undefined success message
skjnldsv Dec 5, 2024
4afc3d5
fix(files_versions): fix missing label
skjnldsv Dec 5, 2024
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
Prev Previous commit
fix(files_versions): fix missing label 
Signed-off-by: skjnldsv <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Dec 5, 2024
commit 4afc3d52092a525033e8109f4e1e058a07ed2557
20 changes: 14 additions & 6 deletions apps/files_versions/src/components/Version.vue
View file
Open in desktop
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
View file
Open in desktop
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
Loading