diff --git a/build/Version.props b/build/Version.props index d3356d6a53..c5d6814939 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ - 4.10.3 + 4.10.4 3.0.0 9.0.1 9.0.0 diff --git a/src/Tgstation.Server.Host/Controllers/JobController.cs b/src/Tgstation.Server.Host/Controllers/JobController.cs index 95b7b95634..feb2ea4577 100644 --- a/src/Tgstation.Server.Host/Controllers/JobController.cs +++ b/src/Tgstation.Server.Host/Controllers/JobController.cs @@ -69,6 +69,7 @@ namespace Tgstation.Server.Host.Controllers .Jobs .AsQueryable() .Include(x => x.StartedBy) + .Include(x => x.CancelledBy) .Where(x => x.Instance.Id == Instance.Id && !x.StoppedAt.HasValue) .OrderByDescending(x => x.StartedAt))), null, @@ -95,6 +96,7 @@ namespace Tgstation.Server.Host.Controllers .Jobs .AsQueryable() .Include(x => x.StartedBy) + .Include(x => x.CancelledBy) .Where(x => x.Instance.Id == Instance.Id) .OrderByDescending(x => x.StartedAt))), null, @@ -121,6 +123,7 @@ namespace Tgstation.Server.Host.Controllers var job = await DatabaseContext .Jobs .AsQueryable() + .Include(x => x.StartedBy) .Where(x => x.Id == id && x.Instance.Id == Instance.Id) .FirstOrDefaultAsync(cancellationToken) .ConfigureAwait(false); @@ -156,6 +159,7 @@ namespace Tgstation.Server.Host.Controllers .AsQueryable() .Where(x => x.Id == id && x.Instance.Id == Instance.Id) .Include(x => x.StartedBy) + .Include(x => x.CancelledBy) .FirstOrDefaultAsync(cancellationToken) .ConfigureAwait(false); if (job == default)