From 063ed7f8d9bffce1e284eca60a30b8bf4c978539 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 30 Dec 2020 19:23:18 -0500 Subject: [PATCH] Fix user controller includes --- src/Tgstation.Server.Host/Controllers/UserController.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Controllers/UserController.cs b/src/Tgstation.Server.Host/Controllers/UserController.cs index 662c12a163..f4c46de26a 100644 --- a/src/Tgstation.Server.Host/Controllers/UserController.cs +++ b/src/Tgstation.Server.Host/Controllers/UserController.cs @@ -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();