From 227e7a9c70d7c2e3521c0bc55f83c673898b5566 Mon Sep 17 00:00:00 2001
From: Simone Chiaretta <simone@piyosailing.com>
Date: Tue, 8 Mar 2016 11:21:21 +0100
Subject: [PATCH 1/3] [U4-8128] Always rejecting promise even with server error

Updated postSaveContent and resourcePromise to always reject the promise (thus always calling callers error handler) even when the error is 500 server error
---
 .../services/umbrequesthelper.service.js      | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
index ccdd283ea6..a3d1e5b0c6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
@@ -170,16 +170,14 @@ function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogServ
                     }
                     
                 }
-                else {
 
-                    //return an error object including the error message for UI
-                    deferred.reject({
-                        errorMsg: result.errorMsg,
-                        data: result.data,
-                        status: result.status
-                    });
+                //return an error object including the error message for UI
+                deferred.reject({
+                    errorMsg: result.errorMsg,
+                    data: result.data,
+                    status: result.status
+                });
 
-                }
 
             });
 
@@ -266,15 +264,14 @@ function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogServ
                         }
                         
                     }
-                    else {
-
-                        //return an error object including the error message for UI
-                        deferred.reject({
-                            errorMsg: 'An error occurred',
-                            data: data,
-                            status: status
-                        });
-                    }
+                    
+                    //return an error object including the error message for UI
+                    deferred.reject({
+                        errorMsg: 'An error occurred',
+                        data: data,
+                        status: status
+                    });
+                   
 
                 });
 
@@ -337,4 +334,4 @@ function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogServ
         }
     };
 }
-angular.module('umbraco.services').factory('umbRequestHelper', umbRequestHelper);
\ No newline at end of file
+angular.module('umbraco.services').factory('umbRequestHelper', umbRequestHelper);

From bc2b9ab29850e6473f7c7b6724a5f0e9e1e7a563 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 20 Jun 2016 15:35:30 +0200
Subject: [PATCH 2/3] U4-8614 JsonCamelCaseFormatter breaks the global
 configuration for the default JsonMediaTypeFormatter

---
 .../WebApi/JsonCamelCaseFormatter.cs          | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/WebApi/JsonCamelCaseFormatter.cs b/src/Umbraco.Web/WebApi/JsonCamelCaseFormatter.cs
index 67adea187f..b54d6102c0 100644
--- a/src/Umbraco.Web/WebApi/JsonCamelCaseFormatter.cs
+++ b/src/Umbraco.Web/WebApi/JsonCamelCaseFormatter.cs
@@ -1,5 +1,8 @@
 using System;
+using System.Linq;
+using System.Net.Http.Formatting;
 using System.Web.Http.Controllers;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
 namespace Umbraco.Web.WebApi
@@ -11,7 +14,21 @@ namespace Umbraco.Web.WebApi
     {
         public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
         {
-            controllerSettings.Formatters.JsonFormatter.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
+            //remove all json formatters then add our custom one
+            var toRemove = controllerSettings.Formatters.Where(t => (t is JsonMediaTypeFormatter)).ToList();
+            foreach (var r in toRemove)
+            {
+                controllerSettings.Formatters.Remove(r);
+            }
+
+            var jsonFormatter = new JsonMediaTypeFormatter
+            {
+                SerializerSettings =
+                {
+                    ContractResolver = new CamelCasePropertyNamesContractResolver()
+                }
+            };
+            controllerSettings.Formatters.Add(jsonFormatter);
         }    
     }
 }
\ No newline at end of file

From afcf2e195eb29fef553515f81e5e80fd57deccf4 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 20 Jun 2016 16:10:06 +0200
Subject: [PATCH 3/3] Upgrade to ModelsBuilder 3.0.3

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj   |  4 ++--
 src/Umbraco.Web.UI/config/Dashboard.config | 20 ++++++++++----------
 src/Umbraco.Web.UI/packages.config         |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 053ab0df1d..eceed73792 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -348,8 +348,8 @@
       <Name>umbraco.providers</Name>
     </ProjectReference>
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="Umbraco.ModelsBuilder, Version=3.0.2.93, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Umbraco.ModelsBuilder.3.0.2\lib\Umbraco.ModelsBuilder.dll</HintPath>
+    <Reference Include="Umbraco.ModelsBuilder, Version=3.0.3.94, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Umbraco.ModelsBuilder.3.0.3\lib\Umbraco.ModelsBuilder.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/src/Umbraco.Web.UI/config/Dashboard.config b/src/Umbraco.Web.UI/config/Dashboard.config
index 6f12a0482c..df45708e0f 100644
--- a/src/Umbraco.Web.UI/config/Dashboard.config
+++ b/src/Umbraco.Web.UI/config/Dashboard.config
@@ -89,16 +89,6 @@
       <control>plugins/umbracocontour/formsdashboard.ascx</control>
     </tab>
   </section>
-  <section alias="UmbracoModelsBuilder">
-    <areas>
-      <area>developer</area>
-    </areas>
-    <tab caption="Models Builder">
-      <control>
-        /App_Plugins/ModelsBuilder/modelsbuilder.htm
-      </control>
-    </tab>
-  </section>
   <section alias="UmbracoHealthCheck">
     <areas>
       <area>developer</area>
@@ -109,4 +99,14 @@
       </control>
     </tab>
   </section>
+  <section alias="UmbracoModelsBuilder">
+    <areas>
+      <area>developer</area>
+    </areas>
+    <tab caption="Models Builder">
+      <control>
+        /App_Plugins/ModelsBuilder/modelsbuilder.htm
+      </control>
+    </tab>
+  </section>
 </dashBoard>
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index 9b210f5caa..e85831fd82 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -35,6 +35,6 @@
   <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
   <package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
   <package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net45" />
-  <package id="Umbraco.ModelsBuilder" version="3.0.2" targetFramework="net45" />
+  <package id="Umbraco.ModelsBuilder" version="3.0.3" targetFramework="net45" />
   <package id="UrlRewritingNet.UrlRewriter" version="2.0.7" targetFramework="net45" />
 </packages>
\ No newline at end of file