From: Marcin Haba <marcin.haba@bacula.pl>
Date: Fri, 24 Nov 2023 14:55:26 +0000 (+0100)
Subject: baculum: Tweak using component status
X-Git-Tag: Beta-15.0.1~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58c20ca439663562ebbdbc4df63b3e86778cad0f;p=thirdparty%2Fbacula.git

baculum: Tweak using component status
---

diff --git a/gui/baculum/protected/Web/Pages/ClientView.php b/gui/baculum/protected/Web/Pages/ClientView.php
index 23205ee67..39b0b1cf7 100644
--- a/gui/baculum/protected/Web/Pages/ClientView.php
+++ b/gui/baculum/protected/Web/Pages/ClientView.php
@@ -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';
diff --git a/gui/baculum/protected/Web/Pages/StorageView.php b/gui/baculum/protected/Web/Pages/StorageView.php
index be89c40f5..f29ed28e1 100644
--- a/gui/baculum/protected/Web/Pages/StorageView.php
+++ b/gui/baculum/protected/Web/Pages/StorageView.php
@@ -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';