Skip to content

fix: Display file upload limits in UI #7985

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

Open
Trayshar wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −3
Open

fix: Display file upload limits in UI #7985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions client/components/editor/editor-modal-media.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,15 @@
:label-idle='$t(`editor:assets.uploadAssetsDropZone`)'
allow-multiple='true'
:files='files'
max-files='10'
:max-files='uploadLimits.maxFiles'
:server='filePondServerOpts'
:instant-upload='false'
:allow-revert='false'
@processfile='onFileProcessed'
)
v-divider
v-card-actions.pa-3
.caption.grey--text.text-darken-2 Max 10 files, 5 MB each
.caption.grey--text.text-darken-2 Max {{ uploadLimits.maxFiles }} files, {{ uploadLimits.maxFileSize | prettyBytes }} each
v-spacer
v-btn.px-4(color='teal', dark, @click='upload') {{$t('common:actions.upload')}}

Expand Down Expand Up @@ -291,6 +291,12 @@ export default {
folderTree: get('editor/media@folderTree'),
currentFolderId: sync('editor/media@currentFolderId'),
currentFileId: sync('editor/media@currentFileId'),
uploadLimits() {
return {
maxFiles: this.$store.state.site.uploadMaxFiles,
maxFileSize: this.$store.state.site.uploadMaxFileSize
}
},
pageTotal () {
if (!this.assets) {
return 0
Expand Down
2 changes: 2 additions & 0 deletions client/store/site.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ const state = {
mascot: true,
title: siteConfig.title,
logoUrl: siteConfig.logoUrl,
uploadMaxFileSize: siteConfig.uploadMaxFileSize,
uploadMaxFiles: siteConfig.uploadMaxFiles,
search: '',
searchIsFocused: false,
searchIsLoading: false,
Expand Down
4 changes: 3 additions & 1 deletion server/master.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,9 @@ module.exports = async () => {
company: WIKI.config.company,
contentLicense: WIKI.config.contentLicense,
footerOverride: WIKI.config.footerOverride,
logoUrl: WIKI.config.logoUrl
logoUrl: WIKI.config.logoUrl,
uploadMaxFileSize: WIKI.config.uploads.maxFileSize,
uploadMaxFiles: WIKI.config.uploads.maxFiles
}
res.locals.langs = await WIKI.models.locales.getNavLocales({ cache: true })
res.locals.analyticsCode = await WIKI.models.analytics.getCode({ cache: true })
Expand Down