From: Marcin Haba <marcin.haba@bacula.pl>
Date: Wed, 5 Apr 2023 10:08:56 +0000 (+0200)
Subject: baculum: Add fileset content property to sources endpoint output
X-Git-Tag: Release-13.0.3~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=454c82297facc4f68e5beb5fcd03266d69e0e0f6;p=thirdparty%2Fbacula.git

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 0845d2340..312eaa7b7 100644
--- 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