From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sun, 7 Mar 2021 09:53:48 +0000 (+0100)
Subject: baculum: Use new APIv2 status client request on job history view page
X-Git-Tag: Release-11.0.2~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d564270151575a9a3990606615cc8ca4e19058df;p=thirdparty%2Fbacula.git

baculum: Use new APIv2 status client request on job history view page
---

diff --git a/gui/baculum/protected/Web/Pages/JobHistoryView.php b/gui/baculum/protected/Web/Pages/JobHistoryView.php
index b289859bb..bcc6c20ef 100644
--- a/gui/baculum/protected/Web/Pages/JobHistoryView.php
+++ b/gui/baculum/protected/Web/Pages/JobHistoryView.php
@@ -130,38 +130,27 @@ class JobHistoryView extends BaculumWebPage {
 			'is_running' => $this->is_running
 		);
 		if ($this->is_running) {
-			// Don't call client if job isn't running
-			$client_name = null;
-			$client = $this->getModule('api')->get(
-				array('clients', $clientid)
+			$query_str = '?output=json&type=header';
+			$graph_status = $this->getModule('api')->get(
+				['clients', $clientid, 'status', $query_str]
 			);
-			if ($client->error === 0) {
-				$client_name = $client->output->name;
-			}
-
-			if (is_string($client_name)) {
-				$query_str = '?name=' . rawurlencode($client_name) . '&type=header';
-				$graph_status = $this->getModule('api')->get(
-					array('status', 'client', $query_str)
-				);
 
-				if ($graph_status->error === 0) {
-					$running_job_status['header'] = $graph_status->output;
-				}
+			if ($graph_status->error === 0) {
+				$running_job_status['header'] = $graph_status->output;
+			}
 
-				$query_str = '?name=' . rawurlencode($client_name) . '&type=running';
-				$graph_status = $this->getModule('api')->get(
-					array('status', 'client', $query_str)
-				);
-				if ($graph_status->error === 0) {
-					$jobid = $this->getJobId();
-					for ($i = 0; $i < count($graph_status->output); $i++) {
-						foreach ($graph_status->output[$i] as $key => $val) {
-							$prop = strtolower($key);
-							if ($prop === 'jobid' && intval($val) == $jobid) {
-								$running_job_status['job'] = $graph_status->output[$i];
-								break 2;
-							}
+			$query_str = '?output=json&type=running';
+			$graph_status = $this->getModule('api')->get(
+				['clients', $clientid, 'status', $query_str]
+			);
+			if ($graph_status->error === 0) {
+				$jobid = $this->getJobId();
+				for ($i = 0; $i < count($graph_status->output); $i++) {
+					foreach ($graph_status->output[$i] as $key => $val) {
+						$prop = strtolower($key);
+						if ($prop === 'jobid' && intval($val) == $jobid) {
+							$running_job_status['job'] = $graph_status->output[$i];
+							break 2;
 						}
 					}
 				}