mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-23 18:48:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed regression error preventing proper display of computed share size

Browse Source
This commit is contained in:
Tom Mortensen
2017-06-20 13:02:39 -07:00
parent 87bf2cb074
commit a49301be4a
3 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/include/DiskList.php
+1 -7
View File
@@ -22,7 +22,6 @@ $sec_nfs = parse_ini_file('state/sec_nfs.ini',true);
$sec_afp = parse_ini_file('state/sec_afp.ini',true);
$compute = $_GET['compute'];
$path = $_GET['path'];
$prev = $_GET['prev'];
$display = [];
$display['scale'] = $_GET['scale'];
@@ -53,14 +52,9 @@ if ($compute=='yes') foreach ($disks as $name => $disk) if ($disk['exportable']=
$myDisks = array_filter(array_diff(array_keys($disks), explode(',',$var['shareUserExclude'])), 'globalInclude');
// Share size per disk
$preserve = ($path==$prev || $compute=='yes');
$ssz2 = [];
foreach (glob("state/*.ssz2", GLOB_NOSORT) as $entry) {
if ($preserve) {
$ssz2[basename($entry, ".ssz2")] = parse_ini_file($entry);
} else {
unlink($entry);
}
$ssz2[basename($entry, ".ssz2")] = parse_ini_file($entry);
}
// Build table
plugins/dynamix/include/ShareList.php
+1 -6
View File
@@ -22,7 +22,6 @@ $sec_nfs = parse_ini_file('state/sec_nfs.ini',true);
$sec_afp = parse_ini_file('state/sec_afp.ini',true);
$compute = $_GET['compute'];
$path = $_GET['path'];
$prev = $_GET['prev'];
$display = [];
$display['scale'] = $_GET['scale'];
@@ -60,13 +59,9 @@ if ($compute=='yes') foreach ($shares as $name => $share) exec("webGui/scripts/s
$myDisks = array_filter(array_diff(array_keys($disks), explode(',',$var['shareUserExclude'])), 'globalInclude');
// Share size per disk
$preserve = ($path==$prev || $compute=='yes');
$ssz1 = [];
foreach (glob("state/*.ssz1", GLOB_NOSORT) as $entry) {
if ($preserve)
$ssz1[basename($entry, ".ssz1")] = parse_ini_file($entry);
else
unlink($entry);
$ssz1[basename($entry, ".ssz1")] = parse_ini_file($entry);
}
// Build table