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

Bug Fix #58: Fail to assign MacSecureEnrol devices

Browse Source 
Various code-paths *assumed* valid domain account ids as long as an id
existed (simple null-check). Correct checks for valid domain account ids
has been implemented.
This commit is contained in:
Gary Sharp
2014-07-10 18:33:05 +10:00
parent 2274e2201d
commit 9bfa95e263
4 changed files with 72 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Views/Device/DeviceParts/_Subject.cshtml
+4 -4
View File
@@ -14,9 +14,9 @@
<tr>
<td><span title="Computer Name">Name:</span>
</td>
<td>@if (string.IsNullOrWhiteSpace(Model.Device.DeviceDomainId))
<td>@if (string.IsNullOrWhiteSpace(Model.Device.ComputerName))
{
<span id="Device_Show_Details_Asset_NameUnknown" title="Computer Name" class="smallMessage">&lt;Unknown/Not Allocated&gt;</span>
<span id="Device_Show_Details_Asset_NameUnknown" title="Computer Name" class="smallMessage">&lt;Unknown/None&gt;</span>
}
else
{
@@ -27,9 +27,9 @@
<tr>
<td><span title="Domain Name">Domain:</span>
</td>
<td>@if (string.IsNullOrWhiteSpace(Model.Device.DeviceDomainId))
<td>@if (string.IsNullOrWhiteSpace(Model.Device.ComputerDomainName))
{
<span id="Device_Show_Details_Asset_DomainUnknown" title="Computer Domain" class="smallMessage">&lt;Unknown/Not Allocated&gt;</span>
<span id="Device_Show_Details_Asset_DomainUnknown" title="Computer Domain" class="smallMessage">&lt;None&gt;</span>
}
else
{