cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-31 09:02:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #679 from Cyberboss/FixDDResponse

Browse Source 
Fix CompileJobs in /DreamDaemon responses
This commit is contained in:
Jordan Brown
2018-09-18 23:51:59 -04:00
committed by GitHub
parent ebe0b859d3 7474bd7d0a
commit efa414611d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs
+4 -3
View File
@@ -124,9 +124,10 @@ namespace Tgstation.Server.Host.Controllers
if (revision)
{
result.ActiveCompileJob = dd.ActiveCompileJob?.ToApi();
var compileJob = instance.LatestCompileJob();
result.StagedCompileJob = compileJob?.ToApi();
var latestCompileJob = instance.LatestCompileJob();
result.ActiveCompileJob = (dd.ActiveCompileJob ?? latestCompileJob)?.ToApi();
if (latestCompileJob?.Id != result.ActiveCompileJob?.Id)
result.StagedCompileJob = latestCompileJob?.ToApi();
}
return Json(result);