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

V8: Make Nested Content resilient to missing property editors (#6768)

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-10-24 21:25:15 +02:00
committed by Sebastiaan Janssen
parent 847e82868a
commit 01b9a09c09
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
View File

@@ -122,6 +122,10 @@ namespace Umbraco.Web.PropertyEditors
{
// convert the value, and store the converted value
var propEditor = _propertyEditors[propType.PropertyEditorAlias];
if (propEditor == null)
{
continue;
}
var tempConfig = dataTypeService.GetDataType(propType.DataTypeId).Configuration;
var valEditor = propEditor.GetValueEditor(tempConfig);
var convValue = valEditor.ConvertDbToString(propType, propValues[propAlias]?.ToString(), dataTypeService);
@@ -185,6 +189,11 @@ namespace Umbraco.Web.PropertyEditors
// convert that temp property, and store the converted value
var propEditor = _propertyEditors[propType.PropertyEditorAlias];
if(propEditor == null)
{
propValues[propAlias] = tempProp.GetValue()?.ToString();
continue;
}
var tempConfig = dataTypeService.GetDataType(propType.DataTypeId).Configuration;
var valEditor = propEditor.GetValueEditor(tempConfig);
var convValue = valEditor.ToEditor(tempProp, dataTypeService);
@@ -249,6 +258,10 @@ namespace Umbraco.Web.PropertyEditors
// Lookup the property editor
var propEditor = _propertyEditors[propType.PropertyEditorAlias];
if (propEditor == null)
{
continue;
}
// Create a fake content property data object
var contentPropData = new ContentPropertyData(propValues[propKey], propConfiguration);
@@ -306,6 +319,11 @@ namespace Umbraco.Web.PropertyEditors
var config = dataTypeService.GetDataType(propType.DataTypeId).Configuration;
var propertyEditor = _propertyEditors[propType.PropertyEditorAlias];
if (propertyEditor == null)
{
continue;
}
foreach (var validator in propertyEditor.GetValueEditor().Validators)
{
foreach (var result in validator.Validate(propValues[propKey], propertyEditor.GetValueEditor().ValueType, config))