adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-07 09:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix disk storage unit conversion from kB to GB/MB

Browse Source 
Use binary (1024-based) prefixes instead of decimal (1000-based) for
storage unit conversion. Previously dividing by 1000000 and 1000,
now correctly dividing by 1048576 (1024*1024) and 1024.

Fixes #2502
This commit is contained in:
04cb
2026-03-07 18:21:02 +08:00
committed by Pierrick Le Gall
parent 5cfabc12bf
commit 964a2d8ede
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/themes/default/js/intro_tooltips.js
+6 -6
View File
@@ -1,9 +1,9 @@
$(function() { $(function() {
Object.entries(storage_details).forEach(([type, infos]) => { Object.entries(storage_details).forEach(([type, infos]) => {
// Determine if we use MB or GB and show it correctly // Determine if we use MB or GB and show it correctly
let size = infos.total.filesize; let size = infos.total.filesize;
let str_size_type_string = size > 1000000 ? str_gb : str_mb; let str_size_type_string = size > 1048576 ? str_gb : str_mb;
let size_nb = size > 1000000 ? (size / 1000000).toFixed(2) : (size / 1000).toFixed(0); let size_nb = size > 1048576 ? (size / 1048576).toFixed(2) : (size / 1024).toFixed(0);
let str_size = str_size_type_string.replace("%s", size_nb); let str_size = str_size_type_string.replace("%s", size_nb);
// Display head of Tooltip // Display head of Tooltip
@@ -18,12 +18,12 @@ $(function() {
let detail_size = data.filesize; let detail_size = data.filesize;
let detail_str_size_type_string; let detail_str_size_type_string;
let detail_size_nb = 0; let detail_size_nb = 0;
if (detail_size > 1000000) { if (detail_size > 1048576) {
detail_str_size_type_string = str_gb; detail_str_size_type_string = str_gb;
detail_size_nb = (detail_size / 1000000).toFixed(2); detail_size_nb = (detail_size / 1048576).toFixed(2);
} else { } else {
detail_str_size_type_string = str_mb; detail_str_size_type_string = str_mb;
detail_size_nb = (detail_size / 1000).toFixed(0) < 1 ? (detail_size / 1000).toFixed(2) : (detail_size / 1000).toFixed(0); detail_size_nb = (detail_size / 1024).toFixed(0) < 1 ? (detail_size / 1024).toFixed(2) : (detail_size / 1024).toFixed(0);
} }
let detail_str_size = detail_str_size_type_string.replace("%s", detail_size_nb); let detail_str_size = detail_str_size_type_string.replace("%s", detail_size_nb);
$('#storage-detail-' + type).append(''+ $('#storage-detail-' + type).append(''+