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

Fix: Update details device during enrolment #14

Browse Source
This commit is contained in:
Gary Sharp
2013-10-17 11:03:54 +11:00
parent 017b1435d8
commit 51ebc673e7
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.BI/BI/DeviceBI/Enrol.cs
+19 -10
View File
@@ -1,18 +1,16 @@
using System;
using System.Linq;
using System.Text.RegularExpressions;
using Disco.BI.Interop.ActiveDirectory;
using Disco.BI.Extensions; using Disco.BI.Extensions;
using Disco.Data.Configuration.Modules; using Disco.BI.Interop.ActiveDirectory;
using Disco.Data.Repository; using Disco.Data.Repository;
using Disco.Models.ClientServices; using Disco.Models.ClientServices;
using Disco.Models.Interop.ActiveDirectory; using Disco.Models.Interop.ActiveDirectory;
using Disco.Models.Repository; using Disco.Models.Repository;
using Tamir.SharpSsh;
using Disco.Services.Plugins;
using Disco.Services.Plugins.Features.CertificateProvider;
using Disco.Services.Users;
using Disco.Services.Authorization; using Disco.Services.Authorization;
using Disco.Services.Users;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using Tamir.SharpSsh;
namespace Disco.BI.DeviceBI namespace Disco.BI.DeviceBI
{ {
@@ -396,9 +394,15 @@ namespace Disco.BI.DeviceBI
AllowUnauthenticatedEnrol = false, AllowUnauthenticatedEnrol = false,
CreatedDate = DateTime.Now, CreatedDate = DateTime.Now,
EnrolledDate = DateTime.Now, EnrolledDate = DateTime.Now,
LastEnrolDate = DateTime.Now LastEnrolDate = DateTime.Now,
DeviceDetails = new List<DeviceDetail>()
}; };
Database.Devices.Add(RepoDevice); Database.Devices.Add(RepoDevice);
if (!string.IsNullOrEmpty(Request.DeviceLanMacAddress))
RepoDevice.DeviceDetails.LanMacAddress(RepoDevice, Request.DeviceLanMacAddress);
if (!string.IsNullOrEmpty(Request.DeviceWlanMacAddress))
RepoDevice.DeviceDetails.WLanMacAddress(RepoDevice, Request.DeviceWlanMacAddress);
} }
else else
{ {
@@ -414,6 +418,11 @@ namespace Disco.BI.DeviceBI
RepoDevice.DeviceModel = deviceModel; RepoDevice.DeviceModel = deviceModel;
if (!string.IsNullOrEmpty(Request.DeviceLanMacAddress))
RepoDevice.DeviceDetails.LanMacAddress(RepoDevice, Request.DeviceLanMacAddress);
if (!string.IsNullOrEmpty(Request.DeviceWlanMacAddress))
RepoDevice.DeviceDetails.WLanMacAddress(RepoDevice, Request.DeviceWlanMacAddress);
if (!RepoDevice.EnrolledDate.HasValue) if (!RepoDevice.EnrolledDate.HasValue)
RepoDevice.EnrolledDate = DateTime.Now; RepoDevice.EnrolledDate = DateTime.Now;
RepoDevice.LastEnrolDate = DateTime.Now; RepoDevice.LastEnrolDate = DateTime.Now;