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

If MNTP is configured to pick max 1 item, convert the value into IPublishedContent instead of IEnumerable<IPublishedContent>

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-05-19 08:37:33 +02:00
parent 5dbc95a604
commit e2746604a1
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs
View File

@@ -43,7 +43,9 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
=> PropertyCacheLevel.Snapshot;
public override Type GetPropertyValueType(PublishedPropertyType propertyType)
=> typeof (IEnumerable<IPublishedContent>);
=> IsSingleNodePicker(propertyType)
? typeof(IPublishedContent)
: typeof(IEnumerable<IPublishedContent>);
public override object ConvertSourceToIntermediate(IPublishedElement owner, PublishedPropertyType propertyType, object source, bool preview)
{
@@ -73,6 +75,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
if (propertyType.EditorAlias.Equals(Constants.PropertyEditors.Aliases.MultiNodeTreePicker))
{
var udis = (Udi[])source;
var isSingleNodePicker = IsSingleNodePicker(propertyType);
if ((propertyType.Alias != null && PropertiesToExclude.InvariantContains(propertyType.Alias)) == false)
{
@@ -102,9 +105,17 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
if (multiNodeTreePickerItem != null && multiNodeTreePickerItem.ItemType != PublishedItemType.Element)
{
multiNodeTreePicker.Add(multiNodeTreePickerItem);
if (isSingleNodePicker)
{
break;
}
}
}
if (isSingleNodePicker)
{
return multiNodeTreePicker.FirstOrDefault();
}
return multiNodeTreePicker;
}
@@ -141,5 +152,10 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
}
return content;
}
private static bool IsSingleNodePicker(PublishedPropertyType propertyType)
{
return propertyType.DataType.ConfigurationAs<MultiNodePickerConfiguration>().MaxNumber == 1;
}
}
}