From 2bc1c46e5744449c5a67916a9e5d768159b37c38 Mon Sep 17 00:00:00 2001 From: Martin Amsinck Andersen Date: Tue, 4 May 2021 13:40:53 +0200 Subject: [PATCH] Casing in appsettings:umbraco:cms:contentMacroErrors and using MacroErrorBehaviour Enum (#10208) * appsettings "WebRouting:DisableRedirectUrlTracking" should be a bool not a string * Casing in appsettings "Umbraco:CMS:Content:MacroErrors" + Using MacroErrorBehaviour enum --- .../HealthChecks/Checks/Configuration/MacroErrorsCheck.cs | 7 ++++--- .../Configuration/JsonConfigManipulator.cs | 4 ++-- src/Umbraco.Web.UI.NetCore/appsettings.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Core/HealthChecks/Checks/Configuration/MacroErrorsCheck.cs b/src/Umbraco.Core/HealthChecks/Checks/Configuration/MacroErrorsCheck.cs index 3237879a03..7359a60341 100644 --- a/src/Umbraco.Core/HealthChecks/Checks/Configuration/MacroErrorsCheck.cs +++ b/src/Umbraco.Core/HealthChecks/Checks/Configuration/MacroErrorsCheck.cs @@ -1,10 +1,11 @@ -// Copyright (c) Umbraco. +// Copyright (c) Umbraco. // See LICENSE for more details. using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Options; using Umbraco.Cms.Core.Configuration.Models; +using Umbraco.Cms.Core.Macros; using Umbraco.Cms.Core.Services; using Umbraco.Extensions; @@ -56,12 +57,12 @@ namespace Umbraco.Cms.Core.HealthChecks.Checks.Configuration new AcceptableConfiguration { IsRecommended = true, - Value = "inline" + Value = MacroErrorBehaviour.Inline.ToString() }, new AcceptableConfiguration { IsRecommended = false, - Value = "silent" + Value = MacroErrorBehaviour.Silent.ToString() } }; diff --git a/src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs b/src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs index 78bb73f301..f9cc387929 100644 --- a/src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs +++ b/src/Umbraco.Infrastructure/Configuration/JsonConfigManipulator.cs @@ -74,7 +74,7 @@ namespace Umbraco.Cms.Core.Configuration var json = GetJson(provider); - var item = GetDisableRedirectUrlItem(disable.ToString().ToLowerInvariant()); + var item = GetDisableRedirectUrlItem(disable); json.Merge(item, new JsonMergeSettings()); @@ -115,7 +115,7 @@ namespace Umbraco.Cms.Core.Configuration return writer.Token; } - private JToken GetDisableRedirectUrlItem(string value) + private JToken GetDisableRedirectUrlItem(bool value) { JTokenWriter writer = new JTokenWriter(); diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json index 0d0330b07b..a44b576dd6 100644 --- a/src/Umbraco.Web.UI.NetCore/appsettings.json +++ b/src/Umbraco.Web.UI.NetCore/appsettings.json @@ -18,7 +18,7 @@ "Notifications": { "Email": "your@email.here" }, - "MacroErrors": "throw" + "MacroErrors": "Throw" }, "Global": { "DefaultUILanguage": "en-us",