mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-26 04:11:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Multi cache pool support

Browse Source
This commit is contained in:
bergware
2020-04-18 09:05:03 +02:00
parent 30907cd575
commit a228940bbf
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/ShareList.page
+1 -1
View File
@@ -22,7 +22,7 @@ function displayShares(all) {
$('#shareslist').html("<tr><td colspan='8'><div class='spinner'></div></td></tr>");
$('div.spinner').html(unraid_logo);
}
$.get('/webGui/include/ShareList.php',{compute:all,path:'<?=addslashes(htmlspecialchars($path))?>',scale:'<?=$display['scale']?>',number:'<?=$display['number']?>',fill:$.cookie('ssz')},function(data){
$.get('/webGui/include/ShareList.php',{compute:all,path:'<?=addslashes(htmlspecialchars($path))?>',scale:'<?=$display['scale']?>',number:'<?=$display['number']?>',raw:'<?=$display['raw']?>',fill:$.cookie('ssz')},function(data){
$.removeCookie('ssz',{path:'/'})
$('#shareslist').html(data);
$('#compute-shares').prop('disabled',!data || data.indexOf('colspan=')!=-1);
plugins/dynamix/include/ShareList.php
+3 -2
View File
@@ -30,6 +30,7 @@ $fill = $_GET['fill'];
$display = [];
$display['scale'] = $_GET['scale'];
$display['number'] = $_GET['number'];
$display['raw'] = $_GET['raw'];
$pools = implode(',',pools_filter(cache_filter($disks)));
@@ -95,7 +96,7 @@ foreach ($shares as $name => $share) {
echo "<td>".user_share_settings($var['shareSMBEnabled'], $sec[$name])."</td>";
echo "<td>".user_share_settings($var['shareNFSEnabled'], $sec_nfs[$name])."</td>";
$cmd="/webGui/scripts/share_size"."&arg1=".urlencode($name)."&arg2=ssz1&arg3=".urlencode($pools);
$cache = _(ucfirst($share['useCache'])).($share['useCache']!='no'?' : '.compress($share['cachePool']):'');
$cache = _(ucfirst($share['useCache'])).($share['useCache']!='no'?' : '.compress(my_disk($share['cachePool'],$display['raw'])):'');
if (array_key_exists($name, $ssz1)) {
echo "<td>$cache</td>";
echo "<td>".my_scale($ssz1[$name]['disk.total']*1024, $unit)." $unit</td>";
@@ -107,7 +108,7 @@ foreach ($shares as $name => $share) {
$include = $share['include'];
$inside = in_array($diskname, array_filter(array_diff($myDisks, explode(',',$share['exclude'])), 'shareInclude'));
echo "<tr class='share_status_size".($inside ? "'>" : " warning'>");
echo "<td>".my_lang(my_disk($diskname),3).":</td>";
echo "<td>".my_lang(my_disk($diskname,$display['raw']),3).":</td>";
echo "<td>".($inside ? "" : "<em>"._('Share is outside the list of designated disks')."</em>")."</td>";
echo "<td></td>";
echo "<td></td>";