From: Marcin Haba <marcin.haba@bacula.pl>
Date: Tue, 20 Dec 2022 08:32:27 +0000 (+0100)
Subject: baculum: Fix using multiple job statuses in list jobs jobstatus filter
X-Git-Tag: Release-13.0.2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1372ab9619eebea43fd56246d962db3e3ace6176;p=thirdparty%2Fbacula.git

baculum: Fix using multiple job statuses in list jobs jobstatus filter
---

diff --git a/gui/baculum/protected/API/Pages/API/Jobs.php b/gui/baculum/protected/API/Pages/API/Jobs.php
index 7f6021e3c..8382aab4b 100644
--- a/gui/baculum/protected/API/Pages/API/Jobs.php
+++ b/gui/baculum/protected/API/Pages/API/Jobs.php
@@ -121,17 +121,17 @@ class Jobs extends BaculumAPIServer {
 
 		$jobstatuses = array_keys($misc->getJobState());
 		$sts = str_split($jobstatus);
-		$counter = 0;
+		$js_counter = 0;
 		for ($i = 0; $i < count($sts); $i++) {
 			if (in_array($sts[$i], $jobstatuses)) {
 				if (!key_exists('Job.JobStatus', $params)) {
-					$params['Job.JobStatus'][$counter] = [
+					$params['Job.JobStatus'] = [];
+					$params['Job.JobStatus'][$js_counter] = [
 						'operator' => 'OR',
 						'vals' => []
 					];
 				}
-				$params['Job.JobStatus'][$counter]['vals'][] = $sts[$i];
-				$counter++;
+				$params['Job.JobStatus'][$js_counter]['vals'][] = $sts[$i];
 			}
 		}
 		if (!empty($level)) {
diff --git a/gui/baculum/protected/API/openapi_baculum.json b/gui/baculum/protected/API/openapi_baculum.json
index 8b52ad9e0..67c644d23 100644
--- a/gui/baculum/protected/API/openapi_baculum.json
+++ b/gui/baculum/protected/API/openapi_baculum.json
@@ -876,7 +876,7 @@
 						"name": "jobstatus",
 						"in": "query",
 						"required": false,
-						"description": "Job status letter",
+						"description": "Job status letter(s). Possible multiple values like 'Ef' or 'Tef'",
 						"schema": {
 							"type": "string"
 						}