baculum: Fix content field in job record

diff --git a/gui/baculum/protected/API/Modules/JobManager.php b/gui/baculum/protected/API/Modules/JobManager.php
index 3e5e3b41b9b73c1900b1e71145c60c8421c9be65..04a54418968917f95455c0305a0f966f851f6566 100644 (file)
--- 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)