From c36a1e453777eb241e4df5efe30c4c60ea8ffa4e Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 31 Jul 2018 12:50:30 +1000 Subject: [PATCH] Fixes issue with pre-value models due to data type refactor (has been already fixed in other temp branches) --- src/Umbraco.Web/PropertyEditors/GridConfiguration.cs | 11 +++++++---- .../PropertyEditors/RichTextConfiguration.cs | 8 +++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs index 23cc722e6f..b471a42266 100644 --- a/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs +++ b/src/Umbraco.Web/PropertyEditors/GridConfiguration.cs @@ -1,4 +1,5 @@ -using Umbraco.Core.PropertyEditors; +using Newtonsoft.Json.Linq; +using Umbraco.Core.PropertyEditors; namespace Umbraco.Web.PropertyEditors { @@ -7,10 +8,12 @@ namespace Umbraco.Web.PropertyEditors /// public class GridConfiguration { + //fixme: Make these strongly typed, for now this works though [ConfigurationField("items", "Grid", "views/propertyeditors/grid/grid.prevalues.html", Description = "Grid configuration")] - public string Items { get; set; } + public JObject Items { get; set; } + //fixme: Make these strongly typed, for now this works though [ConfigurationField("rte", "Rich text editor", "views/propertyeditors/rte/rte.prevalues.html", Description = "Rich text editor configuration")] - public string Rte { get; set; } + public JObject Rte { get; set; } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs b/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs index 420abe61cc..43053addd4 100644 --- a/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs +++ b/src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs @@ -1,4 +1,5 @@ -using Umbraco.Core.PropertyEditors; +using Newtonsoft.Json.Linq; +using Umbraco.Core.PropertyEditors; namespace Umbraco.Web.PropertyEditors { @@ -7,10 +8,11 @@ namespace Umbraco.Web.PropertyEditors /// public class RichTextConfiguration { + //fixme: Make these strongly typed, for now this works though [ConfigurationField("editor", "Editor", "views/propertyeditors/rte/rte.prevalues.html", HideLabel = true)] - public string Editor { get; set; } + public JObject Editor { get; set; } [ConfigurationField("hideLabel", "Hide Label", "boolean")] public bool HideLabel { get; set; } } -} \ No newline at end of file +}