baculum: Add fileset content property to sources endpoint output

diff --git a/gui/baculum/protected/API/Modules/SourceManager.php b/gui/baculum/protected/API/Modules/SourceManager.php
index 0845d2340ce577cc242ba75486f9f867b1b70a4a..312eaa7b7673e78913d02482c1b2d2e874e3fce0 100644 (file)
--- a/gui/baculum/protected/API/Modules/SourceManager.php
+++ b/gui/baculum/protected/API/Modules/SourceManager.php
@@ -42,8 +42,9 @@ class SourceManager extends APIModule {
                }
                $where = Database::getWhere($criteria, true);
                $sql = 'SELECT DISTINCT 
-       sres.fileset, sres.client, sres.job, jres.starttime, jres.endtime, ores.jobid, jres.jobstatus, jres.joberrors
+       sres.fileset, sres.client, sres.job, jres.StartTime, jres.EndTime, ores.jobid, fres.Content, jres.JobStatus, jres.JobErrors
        FROM Job AS jres,
+            FileSet AS fres,
        (
                SELECT DISTINCT
                        FileSet.FileSet AS fileset,
@@ -66,6 +67,7 @@ class SourceManager extends APIModule {
        LEFT JOIN Object USING (JobId)
        WHERE
                jres.JobId = ores.jobid
+               AND jres.FileSetId = fres.FileSetId
                AND sres.job = ores.job
                AND sres.client = ores.client
                AND sres.fileset = ores.fileset