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

Fix: Held Devices

Browse Source
This commit is contained in:
Gary Sharp
2013-07-15 22:28:43 +10:00
parent aa54d93e8e
commit c19fd13c7b
2 changed files with 168 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/Public/Views/HeldDevices/Index.cshtml
+32 -4
View File
@@ -58,10 +58,24 @@
@item.DeviceSerialNumber
</td>
<td class="description">
<span class="user">@item.UserDisplayName (@item.UserId)</span>
@if (item.UserId != null)
{
<span class="user">@item.UserDisplayName (@item.UserId)</span>
}
@if (!string.IsNullOrWhiteSpace(item.DeviceLocation))
{
<text> - </text>@item.DeviceLocation
if (item.UserId != null)
{
<text> - </text>
}
@item.DeviceLocation
}
else
{
if (item.UserId == null)
{
@item.DeviceComputerName
}
}
</td>
<td class="timestamp@(item.IsAlert ? " Alert" : string.Empty)">Since @item.WaitingForUserActionSince
@@ -82,10 +96,24 @@
@item.DeviceSerialNumber
</td>
<td class="description">
<span class="user">@item.UserDisplayName (@item.UserId)</span>
@if (item.UserId != null)
{
<span class="user">@item.UserDisplayName (@item.UserId)</span>
}
@if (!string.IsNullOrWhiteSpace(item.DeviceLocation))
{
<text> - </text>@item.DeviceLocation
if (item.UserId != null)
{
<text> - </text>
}
@item.DeviceLocation
}
else
{
if (item.UserId == null)
{
@item.DeviceComputerName
}
}
</td>
<td class="timestamp@(item.IsAlert ? " Alert" : string.Empty)">Ready @item.ReadyForReturnSince