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

Update: Computer Name in Tech Held Devices

Browse Source 
Requested by Rohan Beckett representing non-1:1 primary schools.
http://discoict.com.au/forum/support/disco-jobs/2013/3/public-reports-not-working.aspx
This commit is contained in:
Gary Sharp
2013-07-22 17:26:28 +10:00
parent c3733c908c
commit ab3ad25944
12 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/Public/Models/HeldDevices/HeldDeviceModel.cs
+2 -2
View File
@@ -17,7 +17,7 @@ namespace Disco.Web.Areas.Public.Models.HeldDevices
{
get
{
StringBuilder sb = new StringBuilder(this.DeviceSerialNumber);
StringBuilder sb = new StringBuilder(this.DeviceComputerName);
if (UserId != null)
sb.Append(" - ").Append(this.UserDisplayName).Append(" (").Append(this.UserId).Append(")");
@@ -25,7 +25,7 @@ namespace Disco.Web.Areas.Public.Models.HeldDevices
if (!string.IsNullOrWhiteSpace(this.DeviceLocation))
sb.Append(" - ").Append(this.DeviceLocation);
else if (UserId == null)
sb.Append(" - ").Append(this.DeviceComputerName);
sb.Append(" - ").Append(this.DeviceSerialNumber);
return sb.ToString();
}
Disco.Web/Areas/Public/Views/HeldDevices/Index.cshtml
+6 -6
View File
@@ -14,7 +14,7 @@
{
<tr>
<td class="id">
@item.DeviceSerialNumber
@item.DeviceComputerName
</td>
<td class="description">
@if (item.UserId != null)
@@ -33,7 +33,7 @@
{
if (item.UserId == null)
{
@item.DeviceComputerName
@item.DeviceSerialNumber
}
}
@if (!string.IsNullOrEmpty(item.EstimatedReturnTime))
@@ -55,7 +55,7 @@
{
<tr>
<td class="id">
@item.DeviceSerialNumber
@item.DeviceComputerName
</td>
<td class="description">
@if (item.UserId != null)
@@ -74,7 +74,7 @@
{
if (item.UserId == null)
{
@item.DeviceComputerName
@item.DeviceSerialNumber
}
}
</td>
@@ -93,7 +93,7 @@
{
<tr>
<td class="id">
@item.DeviceSerialNumber
@item.DeviceComputerName
</td>
<td class="description">
@if (item.UserId != null)
@@ -112,7 +112,7 @@
{
if (item.UserId == null)
{
@item.DeviceComputerName
@item.DeviceSerialNumber
}
}
</td>
Disco.Web/Areas/Public/Views/HeldDevices/Index.generated.cs
+7 -7
View File
@@ -2,7 +2,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18033
// Runtime Version:4.0.30319.18051
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -112,7 +112,7 @@ WriteLiteral(" ");
#line 17 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.DeviceSerialNumber);
Write(item.DeviceComputerName);
#line default
@@ -214,7 +214,7 @@ WriteLiteral("\r\n");
#line hidden
#line 36 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.DeviceComputerName);
Write(item.DeviceSerialNumber);
#line default
@@ -328,7 +328,7 @@ WriteLiteral(" ");
#line 58 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.DeviceSerialNumber);
Write(item.DeviceComputerName);
#line default
@@ -430,7 +430,7 @@ WriteLiteral("\r\n");
#line hidden
#line 77 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.DeviceComputerName);
Write(item.DeviceSerialNumber);
#line default
@@ -530,7 +530,7 @@ WriteLiteral(" ");
#line 96 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.DeviceSerialNumber);
Write(item.DeviceComputerName);
#line default
@@ -632,7 +632,7 @@ WriteLiteral("\r\n");
#line hidden
#line 115 "..\..\Areas\Public\Views\HeldDevices\Index.cshtml"
Write(item.DeviceComputerName);
Write(item.DeviceSerialNumber);
#line default
Disco.Web/Disco.Web.csproj
+1 -1
View File
@@ -1911,7 +1911,7 @@
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
<UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" />
<UserProperties BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
Disco.Web/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.2.0715.2224")]
[assembly: AssemblyFileVersion("1.2.0715.2224")]
[assembly: AssemblyVersion("1.2.0722.1715")]
[assembly: AssemblyFileVersion("1.2.0722.1715")]