mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-04 16:40:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for ZFS subpools

Browse Source
This commit is contained in:
bergware
2023-11-02 11:47:55 +01:00
parent 8d43f62910
commit 1132e39eeb
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
emhttp/plugins/dynamix/DashStats.page
View File

@@ -570,7 +570,7 @@ if (!$group) {
<?$i=0?>
<?foreach ($pools as $pool):?>
<tbody id='pool_list<?=$i?>' title="_(<?=ucfirst($pool)?> Information)_">
<tr><td><i class='icon-disk f32'></i><div class='section'><?=ucfirst($pool)?><?if (!$started):?> (_(stopped)_)<?endif;?><br>
<tr><td><i class='icon-disk f32'></i><div class='section'><?=ucfirst(str_replace($tilde," $arrow ",$pool))?><?if (!$started):?> (_(stopped)_)<?endif;?><br>
<span><?if ($started):?><?=sprintf(_("%s used of %s (%s %%)"),my_scale($cache_used[$pool]*1024,$unit)." $unit",my_scale($cache_size[$pool]*1024,$unit,-1,-1)." $unit",$cache_rate[$pool])?><?endif;?></span><br></div>
<a href='/Dashboard/Settings/Device?name=<?=$pool?>' title="_(Go to disk settings)_"><i class='fa fa-fw fa-cog control'></i></a>
</td></tr>

1
emhttp/plugins/dynamix/include/Wrappers.php
View File

@@ -19,6 +19,7 @@ $subpools = ['special','logs','dedup','cache','spares'];
// ZFS subpool name separator and replacement
$tilde = '~';
$proxy = '__';
$arrow = '&#187;';
// Wrapper functions
function parse_plugin_cfg($plugin, $sections=false, $scanner=INI_SCANNER_NORMAL) {

4
emhttp/plugins/dynamix/nchan/device_list
View File

@@ -37,7 +37,7 @@ function model($id) {
return substr($id,0,strrpos($id,'_'));
}
function device_info(&$disk,$online) {
global $pools, $var, $crypto, $tilde;
global $pools, $var, $crypto, $tilde, $arrow;
if (!$online || _var($disk,'fsStatus')!='Mounted' || (in_array(_var($disk,'type'),['Parity','Cache']) && (!in_array(_var($disk,'name'),$pools) || isSubpool(_var($disk,'name'))))) {
$view = "<a class='view'></a>";
} else {
@@ -47,7 +47,7 @@ function device_info(&$disk,$online) {
$name = _var($disk,'name');
$named = no_tilde($name);
$extra = my_explode($tilde,$name)[1];
$fancyname = compress($extra ? '&#187; '._(my_disk($extra),3) : _(my_disk($name),3),16,5);
$fancyname = compress($extra ? "$arrow "._(my_disk($extra),3) : _(my_disk($name),3),16,5);
$type = _var($disk,'type')=='Flash' ? $disk['type'] : 'Device';
$pool = _var($disk,'type')=='Cache';
$parity = _var($disk,'type')=='Parity';