From: Marcin Haba <marcin.haba@bacula.pl>
Date: Wed, 14 Jun 2023 13:29:14 +0000 (+0200)
Subject: baculum: Add job type property to objects overview endpoint
X-Git-Tag: Release-13.0.4~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1adb28f5c01d3c00a558c7a7b22b515fc511bfb0;p=thirdparty%2Fbacula.git

baculum: Add job type property to objects overview endpoint
---

diff --git a/gui/baculum/protected/API/Modules/ObjectManager.php b/gui/baculum/protected/API/Modules/ObjectManager.php
index 1c91949ea..25218af83 100644
--- a/gui/baculum/protected/API/Modules/ObjectManager.php
+++ b/gui/baculum/protected/API/Modules/ObjectManager.php
@@ -227,6 +227,7 @@ LEFT JOIN Client USING (ClientId) '
 					Client.ClientId AS clienid,
 					Client.Name     AS client,
 					Job.Name        AS job,
+					Job.Type	AS type,
 					Job.Level       AS level,
 					ObjectId        AS objectid,
 					Object.JobId    AS jobid,
@@ -252,6 +253,7 @@ LEFT JOIN Client USING (ClientId) '
 							Client.ClientId AS clienid,
 							Client.Name     AS client,
 							JobId           AS jobid,
+							Job.Type	AS type,
 							Job.Level       AS level,
 							JobTDate        AS jobtdate,
 							StartTime       AS starttime,
@@ -284,6 +286,7 @@ LEFT JOIN Client USING (ClientId) '
 						Client.ClientId AS clienid,
 						Client.Name     AS client,
 						Job.Name        AS Job,
+						Job.Type	AS type,
 						Job.Level       AS level,
 						ObjectId        AS objectid,
 						Object.JobId    AS jobid,
@@ -307,6 +310,7 @@ LEFT JOIN Client USING (ClientId) '
 						objectname,
 						client,
 						job,
+						type,
 						objectid,
 						jobid,
 						AAA.jobtdate,
@@ -336,6 +340,7 @@ LEFT JOIN Client USING (ClientId) '
 						Client.ClientId AS clienid,
 						Client.Name     AS client,
 						JobId           AS jobid,
+						Job.Type	AS type,
 						Job.Level       AS level,
 						JobTDate        AS jobtdate,
 						StartTime       AS starttime,
@@ -358,6 +363,7 @@ LEFT JOIN Client USING (ClientId) '
 						clienid,
 						client,
 						jobid,
+						type,
 						level,
 						AAA.jobtdate,
 						starttime,
diff --git a/gui/baculum/protected/API/openapi_baculum.json b/gui/baculum/protected/API/openapi_baculum.json
index 814d305b0..6febb9cc2 100644
--- a/gui/baculum/protected/API/openapi_baculum.json
+++ b/gui/baculum/protected/API/openapi_baculum.json
@@ -8599,6 +8599,10 @@
 																				"type": "string",
 																				"description": "Job name"
 																			},
+																			"type": {
+																				"type": "string",
+																				"description": "Job type"
+																			},
 																			"level": {
 																				"type": "string",
 																				"description": "Job level"
@@ -8672,6 +8676,10 @@
 																				"type": "string",
 																				"description": " Job identifier"
 																			},
+																			"type": {
+																				"type": "string",
+																				"description": "Job type"
+																			},
 																			"level": {
 																				"type": "string",
 																				"description": "Job level"