cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-29 16:11:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix user controller includes

Browse Source
This commit is contained in:
Jordan Brown
2020-12-30 19:23:18 -05:00
parent 1ec16a22bd
commit 063ed7f8d9
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Controllers/UserController.cs
+6 -1
View File
@@ -225,6 +225,7 @@ namespace Tgstation.Server.Host.Controllers
.Include(x => x.CreatedBy)
.Include(x => x.OAuthConnections)
.Include(x => x.Group)
.ThenInclude(x => x.PermissionSet)
.Include(x => x.PermissionSet)
.FirstOrDefaultAsync(cancellationToken)
.ConfigureAwait(false);
@@ -375,8 +376,10 @@ namespace Tgstation.Server.Host.Controllers
.AsQueryable()
.Where(x => x.CanonicalName != Models.User.CanonicalizeName(Models.User.TgsSystemUserName))
.Include(x => x.CreatedBy)
.Include(x => x.PermissionSet)
.Include(x => x.OAuthConnections)
.Include(x => x.Group))),
.Include(x => x.Group)
.ThenInclude(x => x.PermissionSet))),
null,
page,
pageSize,
@@ -408,6 +411,8 @@ namespace Tgstation.Server.Host.Controllers
.Include(x => x.CreatedBy)
.Include(x => x.OAuthConnections)
.Include(x => x.Group)
.ThenInclude(x => x.PermissionSet)
.Include(x => x.PermissionSet)
.FirstOrDefaultAsync(cancellationToken).ConfigureAwait(false);
if (user == default)
return NotFound();