Merge branch 'stable28' into backport/42660/stable28

This commit is contained in:
Benjamin Gaussorgues 2024-01-15 15:56:12 +01:00 committed by GitHub
commit 596f0c1a69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 23 deletions

View file

@ -80,8 +80,9 @@ import { translate as t, translatePlural as n } from '@nextcloud/l10n'
import { defineComponent } from 'vue'
import { action as sidebarAction } from '../actions/sidebarAction.ts'
import { useUserConfigStore } from '../store/userconfig.ts'
import { getSummaryFor } from '../utils/fileUtils'
import { useSelectionStore } from '../store/selection.js'
import { useUserConfigStore } from '../store/userconfig.ts'
import FileEntry from './FileEntry.vue'
import FileEntryGrid from './FileEntryGrid.vue'
@ -146,25 +147,14 @@ export default defineComponent({
return this.userConfigStore.userConfig
},
files() {
return this.nodes.filter(node => node.type === 'file')
},
fileId() {
return parseInt(this.$route.params.fileid) || null
},
summaryFile() {
const count = this.files.length
return n('files', '{count} file', '{count} files', count, { count })
},
summaryFolder() {
const count = this.nodes.length - this.files.length
return n('files', '{count} folder', '{count} folders', count, { count })
},
summary() {
return t('files', '{summaryFile} and {summaryFolder}', this)
return getSummaryFor(this.nodes)
},
isMtimeAvailable() {
// Hide mtime column on narrow screens
if (this.filesListWidth < 768) {

4
dist/614-614.js vendored

File diff suppressed because one or more lines are too long

2
dist/614-614.js.map vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

4
dist/files-main.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long