mirror of
https://github.com/unraid/webgui.git
synced 2026-05-06 12:21:34 -05:00
Share/Pool size calculation: show and allow percentage values
This commit is contained in:
@@ -36,7 +36,6 @@ function presetSpace($val) {
|
||||
global $disk,$display;
|
||||
if (!$val or strcasecmp($val,'NaN')==0) return;
|
||||
sanitize($val);
|
||||
[$dot,$comma] = str_split(_var($display,'number','.,'));
|
||||
$size = _var($disk,'fsSize',0);
|
||||
$size = $size>0 ? round(100*$val/$size,1) : 0;
|
||||
$unit = '%';
|
||||
@@ -46,6 +45,7 @@ function presetSpace($val) {
|
||||
$size = round($val/pow(1000,$base),1);
|
||||
$unit = _var($units,$base);
|
||||
}
|
||||
[$dot,$comma] = str_split(_var($display,'number','.,'));
|
||||
return $size>0 ? number_format($size,$size-floor($size)?1:0,$dot,$comma).' '.$unit : '';
|
||||
}
|
||||
function fsSize() {
|
||||
|
||||
@@ -59,7 +59,6 @@ function presetSpace($val) {
|
||||
global $disks,$shares,$name,$pools,$display;
|
||||
if (!$val or strcasecmp($val,'NaN')==0) return;
|
||||
sanitize($val);
|
||||
[$dot,$comma] = str_split(_var($display,'number','.,'));
|
||||
$small = [];
|
||||
foreach (data_filter($disks) as $disk) $small[] = _var($disk,'fsSize');
|
||||
$fsSize[""] = min(array_filter($small));
|
||||
@@ -74,6 +73,7 @@ function presetSpace($val) {
|
||||
$size = round($val/pow(1000,$base),1);
|
||||
$unit = _var($units,$base);
|
||||
}
|
||||
[$dot,$comma] = str_split(_var($display,'number','.,'));
|
||||
return $size>0 ? number_format($size,$size-floor($size)?1:0,$dot,$comma).' '.$unit : '';
|
||||
}
|
||||
function fsSize() {
|
||||
|
||||
Reference in New Issue
Block a user