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

fixes tests

Browse Source
This commit is contained in:
Shannon
2020-07-23 22:14:06 +10:00
parent 0e4bf55f84
commit e01f36514b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Core/Models/Blocks/BlockEditorData.cs
View File

@@ -16,6 +16,7 @@ namespace Umbraco.Core.Models.Blocks
private BlockEditorData()
{
BlockValue = new BlockValue();
}
public BlockEditorData(string propertyEditorAlias,

5
src/Umbraco.Web/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs
View File

@@ -18,11 +18,13 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
{
private readonly IProfilingLogger _proflog;
private readonly BlockEditorConverter _blockConverter;
private readonly BlockListEditorDataConverter _blockListEditorDataConverter;
public BlockListPropertyValueConverter(IProfilingLogger proflog, BlockEditorConverter blockConverter)
{
_proflog = proflog;
_blockConverter = blockConverter;
_blockListEditorDataConverter = new BlockListEditorDataConverter();
}
/// <inheritdoc />
@@ -61,8 +63,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
var value = (string)inter;
if (string.IsNullOrWhiteSpace(value)) return BlockListModel.Empty;
var converter = new BlockListEditorDataConverter();
var converted = converter.Deserialize(value);
var converted = _blockListEditorDataConverter.Deserialize(value);
if (converted.BlockValue.ContentData.Count == 0) return BlockListModel.Empty;
var blockListLayout = converted.Layout.ToObject<IEnumerable<BlockListLayoutItem>>();