From e4aaf791e147c3ca10028774381e17dd8afe915d Mon Sep 17 00:00:00 2001 From: bergware Date: Sun, 22 Mar 2020 12:00:12 +0100 Subject: [PATCH] Bug fixes --- plugins/dynamix/ArrayOperation.page | 2 +- plugins/dynamix/DeviceInfo.page | 3 +++ plugins/dynamix/include/DeviceList.php | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page index 3be2813ac..a62d979c7 100644 --- a/plugins/dynamix/ArrayOperation.page +++ b/plugins/dynamix/ArrayOperation.page @@ -554,7 +554,7 @@ function enable_stop() { case 'enable': var stop = $('td#stop'); stop.html(stop.html().replace("","")); - $('input[value="Stop"]').prop('disabled',false); + $('input[value="_(Stop)_"]').prop('disabled',false); break;} }); } diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page index f6ee58754..22d43dc0a 100644 --- a/plugins/dynamix/DeviceInfo.page +++ b/plugins/dynamix/DeviceInfo.page @@ -209,6 +209,9 @@ function xfsCheck(path) { function updateMode(form,mode) { $(form).find('input[name="#arg[3]"]').val(mode); } +$.get('/webGui/include/ReloadPage.php',{btrfs:'btrfs'},function(btrfs) { + if (btrfs=='disable' && !$.cookie('btrfs-balance-')) btrfsBalance($.cookie('btrfs-balance-')); +}); $(function() { 1):?> var ctrl = "'>"; diff --git a/plugins/dynamix/include/DeviceList.php b/plugins/dynamix/include/DeviceList.php index 0aa22721b..bbf0cc53b 100644 --- a/plugins/dynamix/include/DeviceList.php +++ b/plugins/dynamix/include/DeviceList.php @@ -139,8 +139,8 @@ function vfs_luks($fs) { } function fs_info(&$disk) { global $display; - if ($disk['fsStatus']=='-') { - echo ($disk['type']=='Cache' && $disk['name']!='cache') ? ""._('Device is part of a pool')."" : ""; + if (empty($disk['fsStatus'])) { + echo ($disk['type']=='Cache') ? ""._('Device is part of a pool')."" : ""; return; } elseif ($disk['fsStatus']=='Mounted') { echo "".vfs_type($disk['fsType'])."";