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

9842: Fix for defaultConfig not working without prevalues

Browse Source
This commit is contained in:
Patrick de Mooij
2021-02-23 12:57:29 +01:00
committed by Michael Latouche
parent 3e081f1039
commit 3139eb310e
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Umbraco.Core/Manifest/DataEditorConverter.cs
View File

@@ -62,7 +62,7 @@ namespace Umbraco.Core.Manifest
PrepareForPropertyEditor(jobject, dataEditor);
else
PrepareForParameterEditor(jobject, dataEditor);
base.Deserialize(jobject, target, serializer);
}
@@ -86,26 +86,33 @@ namespace Umbraco.Core.Manifest
if (jobject["editor"]["validation"] is JObject validation)
jobject["editor"]["validation"] = RewriteValidators(validation);
if (jobject["prevalues"] is JObject config)
var prevalues = jobject["prevalues"] as JObject;
var defaultConfig = jobject["defaultConfig"] as JObject;
if (prevalues != null || defaultConfig != null)
{
// explicitly assign a configuration editor of type ConfigurationEditor
// (else the deserializer will try to read it before setting it)
// (and besides it's an interface)
target.ExplicitConfigurationEditor = new ConfigurationEditor();
// see note about validators, above - same applies to field validators
if (config["fields"] is JArray jarray)
var config = new JObject();
if (prevalues != null)
{
foreach (var field in jarray)
config = prevalues;
// see note about validators, above - same applies to field validators
if (config["fields"] is JArray jarray)
{
if (field["validation"] is JObject fvalidation)
field["validation"] = RewriteValidators(fvalidation);
foreach (var field in jarray)
{
if (field["validation"] is JObject fvalidation)
field["validation"] = RewriteValidators(fvalidation);
}
}
}
// in the manifest, default configuration is at editor level
// move it down to configuration editor level so it can be deserialized properly
if (jobject["defaultConfig"] is JObject defaultConfig)
if (defaultConfig != null)
{
config["defaultConfig"] = defaultConfig;
jobject.Remove("defaultConfig");

2
src/Umbraco.Tests/Manifest/ManifestParserTests.cs
View File

@@ -187,6 +187,8 @@ javascript: ['~/test.js',/*** some note about stuff asd09823-4**09234*/ '~/test2
var editor = manifest.PropertyEditors[1];
Assert.IsTrue((editor.Type & EditorType.MacroParameter) > 0);
Assert.IsNotEmpty(editor.DefaultConfiguration);
Assert.AreEqual("some default val", editor.DefaultConfiguration["key1"]);
editor = manifest.PropertyEditors[0];
Assert.AreEqual("Test.Test1", editor.Alias);