cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-27 07:04:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1239 from tgstation/ItsTheLittleThings [TGSDeploy]

Browse Source 
v4.10.4
This commit is contained in:
Jordan Brown
2021-03-21 21:19:23 -04:00
committed by GitHub
parent 869455a054 ba4ae3fc46
commit adaae46a7c
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/Version.props
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- Integration tests will ensure they match across the board -->
<Import Project="ControlPanelVersion.props" />
<PropertyGroup>
<TgsCoreVersion>4.10.3</TgsCoreVersion>
<TgsCoreVersion>4.10.4</TgsCoreVersion>
<TgsConfigVersion>3.0.0</TgsConfigVersion>
<TgsApiVersion>9.0.1</TgsApiVersion>
<TgsApiLibraryVersion>9.0.0</TgsApiLibraryVersion>
src/Tgstation.Server.Host/Controllers/JobController.cs
+4
View File
@@ -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)