baculum: Add fileset content property to jobs endpoint

diff --git a/gui/baculum/protected/API/Modules/JobManager.php b/gui/baculum/protected/API/Modules/JobManager.php
index 57cf3c8d6437cd9792d43bb13f841482c069497d..3e5e3b41b9b73c1900b1e71145c60c8421c9be65 100644 (file)
--- a/gui/baculum/protected/API/Modules/JobManager.php
+++ b/gui/baculum/protected/API/Modules/JobManager.php
@@ -161,7 +161,8 @@ class JobManager extends APIModule {
                $sql = 'SELECT ' .  $job_record . ' 
 Client.Name as client, 
 Pool.Name as pool, 
-FileSet.FileSet as fileset 
+FileSet.FileSet as fileset, 
+COALESCE(FileSet.Content, \'\') as content 
 FROM Job 
 JOIN Client USING (ClientId) 
 LEFT JOIN Pool USING (PoolId) 

diff --git a/gui/baculum/protected/API/openapi_baculum.json b/gui/baculum/protected/API/openapi_baculum.json
index 7832d679fd4686dc3561ae23028768b1f4482fbc..1cdd0fc5a15b903a3fdc0ea7fd3e6d9d00fd6640 100644 (file)
--- a/gui/baculum/protected/API/openapi_baculum.json
+++ b/gui/baculum/protected/API/openapi_baculum.json
@@ -10830,6 +10830,10 @@
                                "fileset": {
                                        "description": "FileSet name",
                                        "type": "string"
+                               },
+                               "content": {
+                                       "description": "Comma separated FileSet content types (files, postgresql, mysql...etc.)",
+                                       "type": "string"
                                }
                        }
                },