From 0a759553a7057750e123e1c77c886b9c65eb3a2f Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 7 Jul 2020 13:56:14 +0200
Subject: [PATCH] fixed issue with formatting, by changing order of attributes

Signed-off-by: Bjarke Berg <mail@bergmania.dk>
---
 .../Filters/JsonCamelCaseFormatterAttribute.cs                 | 1 +
 .../Filters/AngularJsonOnlyConfigurationAttribute.cs           | 1 +
 src/Umbraco.Web.Common/Filters/JsonDateTimeFormatAttribute.cs  | 2 +-
 .../Filters/OutgoingNoHyphenGuidFormatAttribute.cs             | 2 +-
 src/Umbraco.Web/Umbraco.Web.csproj                             | 3 +--
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.BackOffice/Filters/JsonCamelCaseFormatterAttribute.cs b/src/Umbraco.Web.BackOffice/Filters/JsonCamelCaseFormatterAttribute.cs
index 03e61f1e53..c5151f42d9 100644
--- a/src/Umbraco.Web.BackOffice/Filters/JsonCamelCaseFormatterAttribute.cs
+++ b/src/Umbraco.Web.BackOffice/Filters/JsonCamelCaseFormatterAttribute.cs
@@ -14,6 +14,7 @@ namespace Umbraco.Web.BackOffice.Filters
     {
         public JsonCamelCaseFormatterAttribute() : base(typeof(JsonCamelCaseFormatterFilter))
         {
+            Order = 2; //must be higher than AngularJsonOnlyConfigurationAttribute.Order
         }
 
         private class JsonCamelCaseFormatterFilter : IResultFilter
diff --git a/src/Umbraco.Web.Common/Filters/AngularJsonOnlyConfigurationAttribute.cs b/src/Umbraco.Web.Common/Filters/AngularJsonOnlyConfigurationAttribute.cs
index ee3f176584..05abe6cfbc 100644
--- a/src/Umbraco.Web.Common/Filters/AngularJsonOnlyConfigurationAttribute.cs
+++ b/src/Umbraco.Web.Common/Filters/AngularJsonOnlyConfigurationAttribute.cs
@@ -16,6 +16,7 @@ namespace Umbraco.Web.Common.Filters
     {
         public AngularJsonOnlyConfigurationAttribute() : base(typeof(AngularJsonOnlyConfigurationFilter))
         {
+            Order = 1; // Must be low, to be overridden by other custom formatters, but higher then all framework stuff.
         }
 
         private class AngularJsonOnlyConfigurationFilter : IResultFilter
diff --git a/src/Umbraco.Web.Common/Filters/JsonDateTimeFormatAttribute.cs b/src/Umbraco.Web.Common/Filters/JsonDateTimeFormatAttribute.cs
index dc4b0ad483..9c9496b282 100644
--- a/src/Umbraco.Web.Common/Filters/JsonDateTimeFormatAttribute.cs
+++ b/src/Umbraco.Web.Common/Filters/JsonDateTimeFormatAttribute.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Web.Common.Filters
     {
         public JsonDateTimeFormatAttribute() : base(typeof(JsonDateTimeFormatFilter))
         {
-            Order = -2000;
+            Order = 2; //must be higher than AngularJsonOnlyConfigurationAttribute.Order
         }
 
         private class JsonDateTimeFormatFilter : IResultFilter
diff --git a/src/Umbraco.Web.Common/Filters/OutgoingNoHyphenGuidFormatAttribute.cs b/src/Umbraco.Web.Common/Filters/OutgoingNoHyphenGuidFormatAttribute.cs
index 02fbbce9e2..27ed71117d 100644
--- a/src/Umbraco.Web.Common/Filters/OutgoingNoHyphenGuidFormatAttribute.cs
+++ b/src/Umbraco.Web.Common/Filters/OutgoingNoHyphenGuidFormatAttribute.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Web.Common.Filters
     {
         public OutgoingNoHyphenGuidFormatAttribute() : base(typeof(OutgoingNoHyphenGuidFormatFilter))
         {
-            Order = -2000;
+            Order = 2; //must be higher than AngularJsonOnlyConfigurationAttribute.Order
         }
 
         private class OutgoingNoHyphenGuidFormatFilter : IResultFilter
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index bbee9d054c..afa9f9f147 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -155,7 +155,6 @@
     <Compile Include="Mvc\UmbracoViewPageOfTModel.cs" />
     <Compile Include="Security\IdentityFactoryMiddleware.cs" />
     <Compile Include="Security\WebSecurity.cs" />
-    <Compile Include="Trees\ITreeNodeController.cs" />
     <Compile Include="WebApi\Filters\EnableOverrideAuthorizationAttribute.cs" />
     <Compile Include="WebApi\Filters\OverridableAuthorizationAttribute.cs" />
     <Compile Include="WebApi\Filters\UmbracoTreeAuthorizeAttribute.cs" />
@@ -416,4 +415,4 @@
     <Folder Include="ContentApps" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>