jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: importing new devices fails for domain joined machines with assigned users

Browse Source
This commit is contained in:
Gary Sharp
2024-04-08 18:11:03 +10:00
parent a675e4a6e9
commit 565e1707ce
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Devices/Importing/Fields/AssignedUserIdImportField.cs
+9 -2
View File
@@ -119,16 +119,23 @@ namespace Disco.Services.Devices.Importing.Fields
// Add Assignment // Add Assignment
if (parsedValue != null) if (parsedValue != null)
{ {
var user = Database.Users.FirstOrDefault(u => u.UserId == parsedValue);
var assignment = new DeviceUserAssignment() var assignment = new DeviceUserAssignment()
{ {
Device = Device, Device = Device,
DeviceSerialNumber = Device.SerialNumber, DeviceSerialNumber = Device.SerialNumber,
AssignedUserId = parsedValue, AssignedUserId = user.UserId,
AssignedUser = user,
AssignedDate = DateTime.Now AssignedDate = DateTime.Now
}; };
Database.DeviceUserAssignments.Add(assignment); Database.DeviceUserAssignments.Add(assignment);
Device.AssignedUser = user;
Device.AssignedUserId = user.UserId;
}
else
{
Device.AssignedUserId = null;
} }
Device.AssignedUserId = parsedValue;
return true; return true;
} }