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

Merge branch 'v8/feature/block-editor-list-validation' into v8/feature/block-list-data-structure-v3

Browse Source
This commit is contained in:
Shannon
2020-07-23 16:55:27 +10:00
parent f7a831f054 f77961ca6e
commit 925ffb1f9b
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Tests/Published/NestedContentTests.cs
View File

@@ -34,7 +34,7 @@ namespace Umbraco.Tests.Published
var proflog = new ProfilingLogger(logger, profiler);
PropertyEditorCollection editors = null;
var editor = new NestedContentPropertyEditor(logger, new Lazy<PropertyEditorCollection>(() => editors), Mock.Of<IDataTypeService>(), Mock.Of<IContentTypeService>());
var editor = new NestedContentPropertyEditor(logger, new Lazy<PropertyEditorCollection>(() => editors), Mock.Of<IDataTypeService>(), Mock.Of<IContentTypeService>(), Mock.Of<ILocalizedTextService>());
editors = new PropertyEditorCollection(new DataEditorCollection(new DataEditor[] { editor }));
var dataType1 = new DataType(editor)

1
src/Umbraco.Web/Editors/Binders/ContentItemBinder.cs
View File

@@ -47,7 +47,6 @@ namespace Umbraco.Web.Editors.Binders
internal static void BindModel(ContentItemSave model, IContent persistedContent)
{
if (model is null) throw new ArgumentNullException(nameof(model));
if (persistedContent is null) throw new ArgumentNullException(nameof(persistedContent));
model.PersistedContent = persistedContent;