nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 16:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

upload-limit v0.2 solved uploadLimitFormate issues , add helper for format_megabytes

Browse Source
This commit is contained in:
Milos Holba
2020-11-07 15:19:03 +01:00
committed by Peter Papp
parent 966145d384
commit 8b8dc34ba6
8 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Helpers/helpers.php
View File

@@ -355,6 +355,23 @@ function format_gigabytes($gigabytes)
} }
} }
/**
* Format string to formated megabytes string
*
* @param $megabytes
* @return string
*/
function format_megabytes($megabytes)
{
if ($megabytes >= 1000) {
return $megabytes / 1000 . 'GB';
} else if ($megabytes >= 1000000) {
return $megabytes / 1000000 . 'TB';
}else {
return $megabytes . 'MB';
}
}
/** /**
* Convert megabytes to bytes * Convert megabytes to bytes
* *

9
public/mix-manifest.json
View File

@@ -74,5 +74,12 @@
"/chunks/user-password.js": "/chunks/user-password.js?id=4d9e46c209e88d5f47ab", "/chunks/user-password.js": "/chunks/user-password.js?id=4d9e46c209e88d5f47ab",
"/chunks/user-storage.js": "/chunks/user-storage.js?id=fafc88cef747e911e17b", "/chunks/user-storage.js": "/chunks/user-storage.js?id=fafc88cef747e911e17b",
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=106a3b5ccd6d467ac524", "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=106a3b5ccd6d467ac524",
"/chunks/users.js": "/chunks/users.js?id=f213041c6b6095cd03e1" "/chunks/users.js": "/chunks/users.js?id=f213041c6b6095cd03e1",
"/js/main.71c8bdcce2ae35287da6.hot-update.js": "/js/main.71c8bdcce2ae35287da6.hot-update.js",
"/js/main.5292f123d34f349af3f6.hot-update.js": "/js/main.5292f123d34f349af3f6.hot-update.js",
"/js/main.0d07f56ebf7453d2a627.hot-update.js": "/js/main.0d07f56ebf7453d2a627.hot-update.js",
"/js/main.b8209d233d5b48391eac.hot-update.js": "/js/main.b8209d233d5b48391eac.hot-update.js",
"/js/main.6a0eebfdcffa7d3cc808.hot-update.js": "/js/main.6a0eebfdcffa7d3cc808.hot-update.js",
"/js/main.4a97328c7fcacdd01080.hot-update.js": "/js/main.4a97328c7fcacdd01080.hot-update.js",
"/js/main.4e7d1c9c07d5a17b4380.hot-update.js": "/js/main.4e7d1c9c07d5a17b4380.hot-update.js"
} }

2
resources/js/helpers.js vendored
View File

@@ -316,7 +316,7 @@ const Helpers = {
events.$emit('alert:open', { events.$emit('alert:open', {
emoji: '😟😟😟', emoji: '😟😟😟',
title: i18n.t('popup_upload_limit.title'), title: i18n.t('popup_upload_limit.title'),
message: i18n.t('popup_upload_limit.message', {uploadLimit: store.getters.config.uploadLimitPopup}), message: i18n.t('popup_upload_limit.message', {uploadLimit: store.getters.config.uploadLimitFormate}),
}) })
break break
} }

2
resources/js/i18n/lang/cn.json
View File

@@ -499,7 +499,7 @@
}, },
"popup_upload_limit": { "popup_upload_limit": {
"title": "Oh No", "title": "Oh No",
"message": "Size of your uploaded file exceeds the upload limit ({uploadLimit} MB)." "message": "Size of your uploaded file exceeds the upload limit ({uploadLimit})."
}, },
"popup_mimetypes_blacklist": { "popup_mimetypes_blacklist": {
"title": "Oh no", "title": "Oh no",

2
resources/js/i18n/lang/en.json
View File

@@ -501,7 +501,7 @@
}, },
"popup_upload_limit": { "popup_upload_limit": {
"title": "Oh No", "title": "Oh No",
"message": "Size of your uploaded file exceeds the upload limit ({uploadLimit} MB)." "message": "Size of your uploaded file exceeds the upload limit ({uploadLimit})."
}, },
"popup_mimetypes_blacklist": { "popup_mimetypes_blacklist": {
"title": "Oh No", "title": "Oh No",

2
resources/js/i18n/lang/sk.json
View File

@@ -501,7 +501,7 @@
}, },
"popup_upload_limit": { "popup_upload_limit": {
"title": "Je nám ľúto", "title": "Je nám ľúto",
"message": "Veľkosť nahravaneho súboru prekročila limit pre nahravane súbory ({uploadLimit} MB)" "message": "Veľkosť nahravaneho súboru prekročila limit pre nahravane súbory ({uploadLimit})"
}, },
"popup_mimetypes_blacklist": { "popup_mimetypes_blacklist": {
"title": "Ospravelnujume sa", "title": "Ospravelnujume sa",

2
resources/js/store/modules/fileFunctions.js vendored
View File

@@ -133,7 +133,7 @@ const actions = {
events.$emit('alert:open', { events.$emit('alert:open', {
emoji: '😟😟😟', emoji: '😟😟😟',
title: i18n.t('popup_upload_limit.title'), title: i18n.t('popup_upload_limit.title'),
message: i18n.t('popup_upload_limit.message', {uploadLimit: getters.config.uploadLimitPopup}) message: i18n.t('popup_upload_limit.message', {uploadLimit: getters.config.uploadLimitFormate})
}) })
break; break;
default: default:

4
resources/views/index.blade.php
View File

@@ -56,8 +56,8 @@
storageDefaultSpace: {{ isset($settings->storage_default) ? $settings->storage_default : 5 }}, storageDefaultSpace: {{ isset($settings->storage_default) ? $settings->storage_default : 5 }},
storageDefaultSpaceFormatted: '{{ isset($settings->storage_default) ? format_gigabytes($settings->storage_default) : format_gigabytes(5) }}', storageDefaultSpaceFormatted: '{{ isset($settings->storage_default) ? format_gigabytes($settings->storage_default) : format_gigabytes(5) }}',
mimetypesBlacklist: '{{ isset($settings->mimetypes_blacklist) ? $settings->mimetypes_blacklist: null}}', mimetypesBlacklist: '{{ isset($settings->mimetypes_blacklist) ? $settings->mimetypes_blacklist: null}}',
uploadLimit: '{{ format_bytes(isset($settings->upload_limit) ? $settings->upload_limit: null)}}' , uploadLimit: '{{ isset($settings->upload_limit) ? format_bytes($settings->upload_limit) : null }}',
uploadLimitPopup: '{{isset($settings->upload_limit)}}', uploadLimitFormate: '{{ isset($settings->upload_limit) ? format_megabytes($settings->upload_limit) : null }}',
hasAuthCookie: {{ Cookie::has('token') ? 1 : 0 }}, hasAuthCookie: {{ Cookie::has('token') ? 1 : 0 }},
isSaaS: {{ isset($settings->license) && $settings->license === 'Extended' ? 1 : 0 }}, isSaaS: {{ isset($settings->license) && $settings->license === 'Extended' ? 1 : 0 }},