From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sun, 1 Nov 2020 05:38:49 +0000 (+0100)
Subject: baculum: Tweak fix getting jobname property
X-Git-Tag: Release-9.6.7~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89073f8f94c7c9e4e09384dc6830c14203777da5;p=thirdparty%2Fbacula.git

baculum: Tweak fix getting jobname property
---

diff --git a/gui/baculum/protected/Web/Portlets/RunJob.php b/gui/baculum/protected/Web/Portlets/RunJob.php
index 1e3a0aaf0..f4694272e 100644
--- a/gui/baculum/protected/Web/Portlets/RunJob.php
+++ b/gui/baculum/protected/Web/Portlets/RunJob.php
@@ -57,14 +57,15 @@ class RunJob extends Portlets {
 		$job_info = [];
 
 		if ($jobid > 0) {
-			$jobdata = $this->getModule('api')->get(
+			$job = $this->getModule('api')->get(
 				['jobs', $jobid],
 				null,
 				true,
 				self::USE_CACHE
 			);
-			if ($jobdata->error == 0) {
-				$jobname = $jobdata->name;
+			if ($job->error == 0) {
+				$jobdata = $job->output;
+				$jobname = $job->output->name;
 			}
 		}
 
@@ -87,12 +88,6 @@ class RunJob extends Portlets {
 			$this->getPage()->getCallbackClient()->show('run_job_storage_from_config_info');
 		} elseif (!empty($jobname)) {
 			$jobdata = new stdClass;
-			$job_show = $this->getModule('api')->get(
-				array('jobs', 'show', '?name='. rawurlencode($jobname)),
-				null,
-				true,
-				self::USE_CACHE
-			)->output;
 			$levels = $this->getModule('misc')->getJobLevels();
 			$levels_flip = array_flip($levels);