yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes issue with pre-value models due to data type refactor (has been already fixed in other temp branches)

Browse Source
This commit is contained in:
Shannon
2018-07-31 12:50:30 +10:00
parent f4342ed9cb
commit c36a1e4537
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web/PropertyEditors/GridConfiguration.cs
View File

@@ -1,4 +1,5 @@
using Umbraco.Core.PropertyEditors; using Newtonsoft.Json.Linq;
using Umbraco.Core.PropertyEditors;
namespace Umbraco.Web.PropertyEditors namespace Umbraco.Web.PropertyEditors
{ {
@@ -7,10 +8,12 @@ namespace Umbraco.Web.PropertyEditors
/// </summary> /// </summary>
public class GridConfiguration 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")] [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")] [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; }
} }
} }

8
src/Umbraco.Web/PropertyEditors/RichTextConfiguration.cs
View File

@@ -1,4 +1,5 @@
using Umbraco.Core.PropertyEditors; using Newtonsoft.Json.Linq;
using Umbraco.Core.PropertyEditors;
namespace Umbraco.Web.PropertyEditors namespace Umbraco.Web.PropertyEditors
{ {
@@ -7,10 +8,11 @@ namespace Umbraco.Web.PropertyEditors
/// </summary> /// </summary>
public class RichTextConfiguration public class RichTextConfiguration
{ {
//fixme: Make these strongly typed, for now this works though
[ConfigurationField("editor", "Editor", "views/propertyeditors/rte/rte.prevalues.html", HideLabel = true)] [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")] [ConfigurationField("hideLabel", "Hide Label", "boolean")]
public bool HideLabel { get; set; } public bool HideLabel { get; set; }
} }
} }