diff --git a/Disco.BI/Properties/AssemblyInfo.cs b/Disco.BI/Properties/AssemblyInfo.cs index d79c6a89..91f8c28f 100644 --- a/Disco.BI/Properties/AssemblyInfo.cs +++ b/Disco.BI/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0715.2224")] -[assembly: AssemblyFileVersion("1.2.0715.2224")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0722.1715")] +[assembly: AssemblyFileVersion("1.2.0722.1715")] \ No newline at end of file diff --git a/Disco.Client/Properties/AssemblyInfo.cs b/Disco.Client/Properties/AssemblyInfo.cs index 46da43b6..1659d342 100644 --- a/Disco.Client/Properties/AssemblyInfo.cs +++ b/Disco.Client/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0715.2224")] -[assembly: AssemblyFileVersion("1.2.0715.2224")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0722.1715")] +[assembly: AssemblyFileVersion("1.2.0722.1715")] \ No newline at end of file diff --git a/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs b/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs index 9b9c76c3..d3aedc4e 100644 --- a/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs +++ b/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0715.2224")] -[assembly: AssemblyFileVersion("1.2.0715.2224")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0722.1715")] +[assembly: AssemblyFileVersion("1.2.0722.1715")] \ No newline at end of file diff --git a/Disco.Data/Properties/AssemblyInfo.cs b/Disco.Data/Properties/AssemblyInfo.cs index c73c5238..e1159a81 100644 --- a/Disco.Data/Properties/AssemblyInfo.cs +++ b/Disco.Data/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0715.2224")] -[assembly: AssemblyFileVersion("1.2.0715.2224")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0722.1715")] +[assembly: AssemblyFileVersion("1.2.0722.1715")] \ No newline at end of file diff --git a/Disco.Models/Properties/AssemblyInfo.cs b/Disco.Models/Properties/AssemblyInfo.cs index 7a3cca25..14340436 100644 --- a/Disco.Models/Properties/AssemblyInfo.cs +++ b/Disco.Models/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0715.2224")] -[assembly: AssemblyFileVersion("1.2.0715.2224")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0722.1715")] +[assembly: AssemblyFileVersion("1.2.0722.1715")] \ No newline at end of file diff --git a/Disco.Services/Properties/AssemblyInfo.cs b/Disco.Services/Properties/AssemblyInfo.cs index eb8c175f..7d4b100a 100644 --- a/Disco.Services/Properties/AssemblyInfo.cs +++ b/Disco.Services/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0715.2224")] -[assembly: AssemblyFileVersion("1.2.0715.2224")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0722.1715")] +[assembly: AssemblyFileVersion("1.2.0722.1715")] \ No newline at end of file diff --git a/Disco.Web.Extensions/Properties/AssemblyInfo.cs b/Disco.Web.Extensions/Properties/AssemblyInfo.cs index b18de56f..46179a77 100644 --- a/Disco.Web.Extensions/Properties/AssemblyInfo.cs +++ b/Disco.Web.Extensions/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0715.2224")] -[assembly: AssemblyFileVersion("1.2.0715.2224")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0722.1715")] +[assembly: AssemblyFileVersion("1.2.0722.1715")] \ No newline at end of file diff --git a/Disco.Web/Areas/Public/Models/HeldDevices/HeldDeviceModel.cs b/Disco.Web/Areas/Public/Models/HeldDevices/HeldDeviceModel.cs index dabccc56..bb5c0fa6 100644 --- a/Disco.Web/Areas/Public/Models/HeldDevices/HeldDeviceModel.cs +++ b/Disco.Web/Areas/Public/Models/HeldDevices/HeldDeviceModel.cs @@ -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(); } diff --git a/Disco.Web/Areas/Public/Views/HeldDevices/Index.cshtml b/Disco.Web/Areas/Public/Views/HeldDevices/Index.cshtml index 753709f8..3e9f8428 100644 --- a/Disco.Web/Areas/Public/Views/HeldDevices/Index.cshtml +++ b/Disco.Web/Areas/Public/Views/HeldDevices/Index.cshtml @@ -14,7 +14,7 @@ {