]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
baculum: Tweak using component status
authorMarcin Haba <marcin.haba@bacula.pl>
Fri, 24 Nov 2023 14:55:26 +0000 (15:55 +0100)
committerMarcin Haba <marcin.haba@bacula.pl>
Fri, 24 Nov 2023 14:55:26 +0000 (15:55 +0100)
gui/baculum/protected/Web/Pages/ClientView.php
gui/baculum/protected/Web/Pages/StorageView.php

index 23205ee6734f7a4886f9949ff40edc1d1cfe2380..39b0b1cf7688950591761133cb981fed1f2db4bb 100644 (file)
@@ -252,9 +252,10 @@ class ClientView extends BaculumWebPage {
        }
 
        public function status($sender, $param) {
-               $raw_status = $this->getModule('api')->get(
+               $rst = $this->getModule('api')->get(
                        ['clients', $this->getClientId(), 'status']
-               )->output;
+               );
+               $raw_status = $rst->error == 0 ? $rst->output : [$rst->output];
                $this->ClientLog->Text = implode(PHP_EOL, $raw_status);
 
                $query_str = '?output=json&type=header';
index be89c40f5a878c406a02d523fdb9c0f81acac0b9..f29ed28e11e7ad508f277b71ab4cab5064d38d05 100644 (file)
@@ -127,9 +127,10 @@ class StorageView extends BaculumWebPage {
        }
 
        public function status($sender, $param) {
-               $raw_status = $this->getModule('api')->get(
+               $rst = $this->getModule('api')->get(
                        ['storages', $this->getStorageId(), 'status']
-               )->output;
+               );
+               $raw_status = $rst->error == 0 ? $rst->output : [$rst->output];
                $this->StorageLog->Text = implode(PHP_EOL, $raw_status);
 
                $query_str = '?output=json&type=header';