From 734f3b8e3ff919ecf04b094dfdd67e4fdb1b6ce8 Mon Sep 17 00:00:00 2001 From: Marcin Haba Date: Mon, 3 Jul 2023 15:35:21 +0200 Subject: [PATCH] baculum: Fix content field in job record --- gui/baculum/protected/API/Modules/JobManager.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gui/baculum/protected/API/Modules/JobManager.php b/gui/baculum/protected/API/Modules/JobManager.php index 3e5e3b41b..04a544189 100644 --- a/gui/baculum/protected/API/Modules/JobManager.php +++ b/gui/baculum/protected/API/Modules/JobManager.php @@ -158,11 +158,16 @@ class JobManager extends APIModule { $join = ' LEFT JOIN Job AS PriorJob ON (Job.PriorJobId = PriorJob.JobId) '; } + $record = FileSetRecord::finder(); + $connection = $record->getDbConnection(); + $tableinfo = $record->getRecordGateway()->getRecordTableInfo($record); + $content = $tableinfo->getColumns()->itemAt('content') !== null ? 'FileSet.Content' : '\'\''; + $sql = 'SELECT ' . $job_record . ' Client.Name as client, Pool.Name as pool, FileSet.FileSet as fileset, -COALESCE(FileSet.Content, \'\') as content +' . $content . ' AS content FROM Job JOIN Client USING (ClientId) LEFT JOIN Pool USING (PoolId) -- 2.47.3