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

Bug Fix: #76 importing devices

Browse Source
This commit is contained in:
Gary Sharp
2016-09-29 17:35:41 +10:00
parent a15f3daad5
commit 669de7e46b
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Devices/Importing/DeviceImportRecord.cs
+9 -2
View File
@@ -47,13 +47,20 @@ namespace Disco.Services.Devices.Importing
} }
else if (RecordAction == EntityState.Added) else if (RecordAction == EntityState.Added)
{ {
// Use 'Add Device Offline' default if available
var deviceProfileId = Database.DiscoConfiguration.DeviceProfiles.DefaultAddDeviceOfflineDeviceProfileId;
if (deviceProfileId == 0)
{
deviceProfileId = Database.DiscoConfiguration.DeviceProfiles.DefaultDeviceProfileId;
}
// Create Device // Create Device
device = new Device() device = new Device()
{ {
SerialNumber = DeviceSerialNumber.ToUpper(), SerialNumber = DeviceSerialNumber.ToUpper(),
CreatedDate = DateTime.Now, CreatedDate = DateTime.Now,
AllowUnauthenticatedEnrol = true, AllowUnauthenticatedEnrol = true,
DeviceProfileId = Database.DiscoConfiguration.DeviceProfiles.DefaultAddDeviceOfflineDeviceProfileId, DeviceProfileId = deviceProfileId,
DeviceModelId = 1 // Default 'Unknown Device Model' DeviceModelId = 1 // Default 'Unknown Device Model'
}; };
Database.Devices.Add(device); Database.Devices.Add(device);
@@ -64,7 +71,7 @@ namespace Disco.Services.Devices.Importing
return false; return false;
} }
bool changesMade = false; bool changesMade = (RecordAction == EntityState.Added);
foreach (var field in Fields.Cast<DeviceImportFieldBase>()) foreach (var field in Fields.Cast<DeviceImportFieldBase>())
{ {
Disco.Services/Devices/Importing/Fields/AssignedUserIdImportField.cs
+4 -2
View File
@@ -104,7 +104,10 @@ namespace Disco.Services.Devices.Importing.Fields
{ {
currentAssignment.UnassignedDate = DateTime.Now; currentAssignment.UnassignedDate = DateTime.Now;
} }
}
if (FieldAction == EntityState.Added || FieldAction == EntityState.Modified)
{
// Add Assignment // Add Assignment
if (parsedValue != null) if (parsedValue != null)
{ {
@@ -133,8 +136,7 @@ namespace Disco.Services.Devices.Importing.Fields
var possibleColumns = Context.Header var possibleColumns = Context.Header
.Select((h, i) => Tuple.Create(h, i)) .Select((h, i) => Tuple.Create(h, i))
.Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn && .Where(h => h.Item1.Item2 == DeviceImportFieldTypes.IgnoreColumn &&
h.Item1.Item1.IndexOf("user id", System.StringComparison.OrdinalIgnoreCase) >= 0 || h.Item1.Item1.IndexOf("user", System.StringComparison.OrdinalIgnoreCase) >= 0
h.Item1.Item1.IndexOf("userid", System.StringComparison.OrdinalIgnoreCase) >= 0
); );
return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault(); return possibleColumns.Select(h => (int?)h.Item2).FirstOrDefault();