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 7f6021e3ca280ca28ef49ce0bef06982dfd08020..8382aab4b1285c892f4646fc7c6b0156661ccb96 100644 (file)
--- 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 8b52ad9e091ddb63ebbdf047c42fd71968bade29..67c644d2344041df053236066551f28673fb392b 100644 (file)
--- 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"
                                                }