From 7befaccf4afc2a1af4f0ce4e6bf50f9230000aa3 Mon Sep 17 00:00:00 2001
From: Gary Sharp <discoict@outlook.com>
Date: Tue, 21 May 2013 11:23:45 +1000
Subject: [PATCH] Fix: Warranty Provider Properties & JSON.net

---
 Disco.BI/Properties/AssemblyInfo.cs           |  4 +--
 Disco.Data/Properties/AssemblyInfo.cs         |  4 +--
 Disco.Models/Properties/AssemblyInfo.cs       |  4 +--
 Disco.Services/Properties/AssemblyInfo.cs     |  4 +--
 .../Properties/AssemblyInfo.cs                |  4 +--
 .../Config/Views/Shared/LogEvents.cshtml      |  3 +--
 .../Views/Shared/LogEvents.generated.cs       | 25 +++++++++----------
 Disco.Web/Controllers/JobController.cs        |  4 +--
 Disco.Web/Models/Job/LogWarrantyModel.cs      |  6 ++---
 Disco.Web/Properties/AssemblyInfo.cs          |  4 +--
 10 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/Disco.BI/Properties/AssemblyInfo.cs b/Disco.BI/Properties/AssemblyInfo.cs
index 8e9c9207..c8f64a16 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.0516.2044")]
-[assembly: AssemblyFileVersion("1.2.0516.2044")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.0521.1121")]
+[assembly: AssemblyFileVersion("1.2.0521.1121")]
\ No newline at end of file
diff --git a/Disco.Data/Properties/AssemblyInfo.cs b/Disco.Data/Properties/AssemblyInfo.cs
index 995cd0b8..348301c6 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.0516.2044")]
-[assembly: AssemblyFileVersion("1.2.0516.2044")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.0521.1121")]
+[assembly: AssemblyFileVersion("1.2.0521.1121")]
\ No newline at end of file
diff --git a/Disco.Models/Properties/AssemblyInfo.cs b/Disco.Models/Properties/AssemblyInfo.cs
index 6136c761..85cbef16 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.0516.2044")]
-[assembly: AssemblyFileVersion("1.2.0516.2044")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.0521.1121")]
+[assembly: AssemblyFileVersion("1.2.0521.1121")]
\ No newline at end of file
diff --git a/Disco.Services/Properties/AssemblyInfo.cs b/Disco.Services/Properties/AssemblyInfo.cs
index 7064f3ca..11dba5cf 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.0516.2044")]
-[assembly: AssemblyFileVersion("1.2.0516.2044")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.0521.1121")]
+[assembly: AssemblyFileVersion("1.2.0521.1121")]
\ No newline at end of file
diff --git a/Disco.Web.Extensions/Properties/AssemblyInfo.cs b/Disco.Web.Extensions/Properties/AssemblyInfo.cs
index 32a5c056..c94e6efc 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.0516.2044")]
-[assembly: AssemblyFileVersion("1.2.0516.2044")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.0521.1121")]
+[assembly: AssemblyFileVersion("1.2.0521.1121")]
\ No newline at end of file
diff --git a/Disco.Web/Areas/Config/Views/Shared/LogEvents.cshtml b/Disco.Web/Areas/Config/Views/Shared/LogEvents.cshtml
index eac35342..e8d3506a 100644
--- a/Disco.Web/Areas/Config/Views/Shared/LogEvents.cshtml
+++ b/Disco.Web/Areas/Config/Views/Shared/LogEvents.cshtml
@@ -37,8 +37,7 @@
         </table>
     </div>
     @{
-        var serializer = new System.Web.Script.Serialization.JavaScriptSerializer();
-        var eventTypesFilterJson = (Model.EventTypesFilter != null) ? serializer.Serialize(Model.EventTypesFilter.Select(et => et.Id).ToArray()) : "null";
+        var eventTypesFilterJson = (Model.EventTypesFilter != null) ? Newtonsoft.Json.JsonConvert.SerializeObject(Model.EventTypesFilter.Select(et => et.Id).ToArray()) : "null";
     }
     <script type="text/javascript">
         $(function () {
diff --git a/Disco.Web/Areas/Config/Views/Shared/LogEvents.generated.cs b/Disco.Web/Areas/Config/Views/Shared/LogEvents.generated.cs
index c65a69a2..163c765a 100644
--- a/Disco.Web/Areas/Config/Views/Shared/LogEvents.generated.cs
+++ b/Disco.Web/Areas/Config/Views/Shared/LogEvents.generated.cs
@@ -164,8 +164,7 @@ WriteLiteral("></td>\r\n                </tr>\r\n            </tbody>\r\n
             
             #line 39 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
       
-        var serializer = new System.Web.Script.Serialization.JavaScriptSerializer();
-        var eventTypesFilterJson = (Model.EventTypesFilter != null) ? serializer.Serialize(Model.EventTypesFilter.Select(et => et.Id).ToArray()) : "null";
+        var eventTypesFilterJson = (Model.EventTypesFilter != null) ? Newtonsoft.Json.JsonConvert.SerializeObject(Model.EventTypesFilter.Select(et => et.Id).ToArray()) : "null";
     
             
             #line default
@@ -177,7 +176,7 @@ WriteLiteral(" type=\"text/javascript\"");
 WriteLiteral(">\r\n        $(function () {\r\n            var logEventsHost = $(\'LogEvents_");
 
             
-            #line 45 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 44 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                          Write(uniqueId);
 
             
@@ -186,7 +185,7 @@ WriteLiteral(">\r\n        $(function () {\r\n            var logEventsHost = $(
 WriteLiteral("\');\r\n            var logModuleId = \'");
 
             
-            #line 46 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 45 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                            Write(Model.ModuleFilter != null ? Model.ModuleFilter.ModuleId.ToString() : null);
 
             
@@ -195,7 +194,7 @@ WriteLiteral("\');\r\n            var logModuleId = \'");
 WriteLiteral("\';\r\n            var logModuleLiveGroupName = \'");
 
             
-            #line 47 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 46 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                       Write(Model.ModuleFilter != null ? Model.ModuleFilter.LiveLogGroupName : Disco.BI.Interop.SignalRHandlers.LogNotifications.AllNotifications);
 
             
@@ -204,7 +203,7 @@ WriteLiteral("\';\r\n            var logModuleLiveGroupName = \'");
 WriteLiteral("\';\r\n            var logEventTypeFiltered = ");
 
             
-            #line 48 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 47 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                    Write(eventTypesFilterJson);
 
             
@@ -213,7 +212,7 @@ WriteLiteral("\';\r\n            var logEventTypeFiltered = ");
 WriteLiteral(";\r\n            var logStartFiler = ");
 
             
-            #line 49 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 48 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                             Write(AjaxHelpers.JsonDate(Model.StartFilter));
 
             
@@ -222,7 +221,7 @@ WriteLiteral(";\r\n            var logStartFiler = ");
 WriteLiteral(";\r\n            var logEndFiler = ");
 
             
-            #line 50 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 49 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                           Write(AjaxHelpers.JsonDate(Model.EndFilter));
 
             
@@ -231,7 +230,7 @@ WriteLiteral(";\r\n            var logEndFiler = ");
 WriteLiteral(";\r\n            var logTakeFiler = \'");
 
             
-            #line 51 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 50 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                             Write(Model.TakeFilter);
 
             
@@ -241,7 +240,7 @@ WriteLiteral("\';\r\n            var liveConnection = null;\r\n            var l
 "tion = \'");
 
             
-            #line 53 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 52 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                          Write(Model.JavascriptLiveEventFunctionName);
 
             
@@ -250,7 +249,7 @@ WriteLiteral("\';\r\n            var liveConnection = null;\r\n            var l
 WriteLiteral("\';\r\n            var useLive = (\'True\'===\'");
 
             
-            #line 54 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 53 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                  Write(Model.IsLive);
 
             
@@ -293,7 +292,7 @@ WriteLiteral(@"');
                     url: '");
 
             
-            #line 88 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 87 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                       Write(Url.Action(MVC.API.Logging.RetrieveEvents()));
 
             
@@ -330,7 +329,7 @@ WriteLiteral(@"',
                     liveConnection = $.connection('");
 
             
-            #line 116 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
+            #line 115 "..\..\Areas\Config\Views\Shared\LogEvents.cshtml"
                                                Write(Url.Content("~/API/Logging/Notifications"));
 
             
diff --git a/Disco.Web/Controllers/JobController.cs b/Disco.Web/Controllers/JobController.cs
index 86b2a4d4..79445981 100644
--- a/Disco.Web/Controllers/JobController.cs
+++ b/Disco.Web/Controllers/JobController.cs
@@ -13,6 +13,7 @@ using Disco.Services.Plugins;
 using Disco.Models.UI.Job;
 using Disco.Services.Plugins.Features.UIExtension;
 using Disco.BI.JobBI;
+using Newtonsoft.Json;
 
 namespace Disco.Web.Controllers
 {
@@ -440,8 +441,7 @@ namespace Disco.Web.Controllers
 
                             if (warrantyProviderProperties != null)
                             {
-                                JavaScriptSerializer j = new JavaScriptSerializer();
-                                m.WarrantyProviderPropertiesJson = j.Serialize(warrantyProviderProperties);
+                                m.WarrantyProviderPropertiesJson = JsonConvert.SerializeObject(warrantyProviderProperties);
                             }
                             m.DiscloseProperties = p.SubmitJobDiscloseInfo(dbContext, m.Job, m.OrganisationAddress, m.TechUser, m.FaultDescription, warrantyProviderProperties);
                             return View(Views.LogWarrantyDisclose, m);
diff --git a/Disco.Web/Models/Job/LogWarrantyModel.cs b/Disco.Web/Models/Job/LogWarrantyModel.cs
index fd9fff82..f4813b06 100644
--- a/Disco.Web/Models/Job/LogWarrantyModel.cs
+++ b/Disco.Web/Models/Job/LogWarrantyModel.cs
@@ -8,6 +8,7 @@ using Disco.BI;
 using System.Web.Script.Serialization;
 using Disco.Services.Plugins;
 using Disco.Services.Plugins.Features.WarrantyProvider;
+using Newtonsoft.Json;
 
 namespace Disco.Web.Models.Job
 {
@@ -38,12 +39,11 @@ namespace Disco.Web.Models.Job
         public Dictionary<string, string> WarrantyProviderProperties()
         {
             Dictionary<string, string> p = default(Dictionary<string, string>);
-            if (string.IsNullOrEmpty(this.WarrantyProviderPropertiesJson))
+            if (!string.IsNullOrEmpty(this.WarrantyProviderPropertiesJson))
             {
-                JavaScriptSerializer s = new JavaScriptSerializer();
                 try
                 {
-                    p = s.Deserialize<Dictionary<string, string>>(this.WarrantyProviderPropertiesJson);
+                    p = JsonConvert.DeserializeObject<Dictionary<string, string>>(this.WarrantyProviderPropertiesJson);
                 }
                 catch (Exception)
                 {
diff --git a/Disco.Web/Properties/AssemblyInfo.cs b/Disco.Web/Properties/AssemblyInfo.cs
index 4500f97b..efe6ba23 100644
--- a/Disco.Web/Properties/AssemblyInfo.cs
+++ b/Disco.Web/Properties/AssemblyInfo.cs
@@ -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.0516.2044")]
-[assembly: AssemblyFileVersion("1.2.0516.2044")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2.0521.1121")]
+[assembly: AssemblyFileVersion("1.2.0521.1121")]
\ No newline at end of file