upload-limit v0.3 solved the multiple DB querys,uploadLimit in config

This commit is contained in:
Milos Holba
2020-11-12 17:46:23 +01:00
committed by Peter Papp
parent 8b8dc34ba6
commit 8fc7272e38
6 changed files with 98 additions and 96 deletions
+1 -3
View File
@@ -308,7 +308,6 @@ const Helpers = {
Vue.prototype.$checkUploadLimit = function (files) {
let uploadLimit = store.getters.config.uploadLimit
let validate = true
console.log(store.getters.config.uploadLimitPopup)
for (let i = 0 ; i<files.length; i++ ) {
if(uploadLimit != 0 && files[i].size > uploadLimit) {
@@ -316,13 +315,12 @@ const Helpers = {
events.$emit('alert:open', {
emoji: '😟😟😟',
title: i18n.t('popup_upload_limit.title'),
message: i18n.t('popup_upload_limit.message', {uploadLimit: store.getters.config.uploadLimitFormate}),
message: i18n.t('popup_upload_limit.message', {uploadLimit: store.getters.config.uploadLimitFormatted}),
})
break
}
}
return validate
}
}
}
+1 -1
View File
@@ -133,7 +133,7 @@ const actions = {
events.$emit('alert:open', {
emoji: '😟😟😟',
title: i18n.t('popup_upload_limit.title'),
message: i18n.t('popup_upload_limit.message', {uploadLimit: getters.config.uploadLimitFormate})
message: i18n.t('popup_upload_limit.message', {uploadLimit: getters.config.uploadLimitFormatted})
})
break;
default:
+2 -2
View File
@@ -56,8 +56,8 @@
storageDefaultSpace: {{ isset($settings->storage_default) ? $settings->storage_default : 5 }},
storageDefaultSpaceFormatted: '{{ isset($settings->storage_default) ? format_gigabytes($settings->storage_default) : format_gigabytes(5) }}',
mimetypesBlacklist: '{{ isset($settings->mimetypes_blacklist) ? $settings->mimetypes_blacklist: null}}',
uploadLimit: '{{ isset($settings->upload_limit) ? format_bytes($settings->upload_limit) : null }}',
uploadLimitFormate: '{{ isset($settings->upload_limit) ? format_megabytes($settings->upload_limit) : null }}',
uploadLimit: {{ isset($settings->upload_limit) ? format_bytes($settings->upload_limit) : 'undefined' }},
uploadLimitFormatted: '{{ isset($settings->upload_limit) ? format_megabytes($settings->upload_limit) : null }}',
hasAuthCookie: {{ Cookie::has('token') ? 1 : 0 }},
isSaaS: {{ isset($settings->license) && $settings->license === 'Extended' ? 1 : 0 }},