bugs: minor

This commit is contained in:
Gary Sharp
2023-01-29 10:10:37 +11:00
parent 708ca16de8
commit 47e11c0fd6
5 changed files with 15 additions and 6 deletions
@@ -99,19 +99,19 @@ namespace Disco.Services
switch (scope)
{
case AttachmentTypes.Device:
var device = database.Devices.Find(targetId);
var device = database.Devices.Include(d => d.AssignedUser).First(d => d.SerialNumber == targetId);
targetUser = device?.AssignedUser;
return device;
case AttachmentTypes.Job:
if (!int.TryParse(targetId, out var targetIdInt))
throw new ArgumentOutOfRangeException(nameof(targetId));
var job = database.Jobs.Find(targetIdInt);
var job = database.Jobs.Include(j => j.User).First(j => j.Id == targetIdInt);
targetUser = job?.User;
return job;
case AttachmentTypes.User:
// special usecase in resolving users (they may not exist in the database yet)
targetId = ActiveDirectory.ParseDomainAccountId(targetId);
var user = database.Users.Find(targetId);
var user = database.Users.First(u => u.UserId == targetId);
if (user == null)
{
// try importing user
+1
View File
@@ -156,6 +156,7 @@ namespace Disco.Services.Plugins
"Microsoft.Owin.Security",
"Microsoft.Web.Infrastructure",
"Newtonsoft.Json",
"Newtonsoft.Json.Bson",
"Owin",
"PdfiumViewer",
"PdfSharp",