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

Revert "Block List Settings throws exception if Models builder mode is set to "Nothing" (#11725)"

Browse Source 
This reverts commit 62b289e179.
This commit is contained in:
Sebastiaan Janssen
2022-04-12 13:45:15 +02:00
parent 4e71d6f2f6
commit 75613cf061
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs
View File

@@ -4,14 +4,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Models.Blocks;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Web.Common.DependencyInjection;
using Umbraco.Extensions;
namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters
@@ -22,20 +17,12 @@ namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters
private readonly IProfilingLogger _proflog;
private readonly BlockEditorConverter _blockConverter;
private readonly BlockListEditorDataConverter _blockListEditorDataConverter;
private readonly ModelsBuilderSettings _modelsBuilderSettings;
[Obsolete("Use ctor injecting ModelsBuilderSettings")]
public BlockListPropertyValueConverter(IProfilingLogger proflog, BlockEditorConverter blockConverter)
: this(proflog, blockConverter,StaticServiceProvider.Instance.GetRequiredService<IOptions<ModelsBuilderSettings>>())
{
}
public BlockListPropertyValueConverter(IProfilingLogger proflog, BlockEditorConverter blockConverter, IOptions<ModelsBuilderSettings> modelsBuilderOptions)
{
_proflog = proflog;
_blockConverter = blockConverter;
_blockListEditorDataConverter = new BlockListEditorDataConverter();
_modelsBuilderSettings = modelsBuilderOptions?.Value;
}
/// <inheritdoc />
@@ -129,7 +116,7 @@ namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters
}
// Get settings type from configuration
var settingsType = blockConfig.SettingsElementTypeKey.HasValue && _modelsBuilderSettings.ModelsMode != ModelsMode.Nothing
var settingsType = blockConfig.SettingsElementTypeKey.HasValue
? _blockConverter.GetModelType(blockConfig.SettingsElementTypeKey.Value)
: typeof(IPublishedElement);

5
tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListPropertyValueConverterTests.cs
View File

@@ -2,11 +2,9 @@
// See LICENSE for more details.
using System;
using Microsoft.Extensions.Options;
using Moq;
using NUnit.Framework;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Logging;
using Umbraco.Cms.Core.Models.Blocks;
using Umbraco.Cms.Core.Models.PublishedContent;
@@ -64,10 +62,9 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
{
IPublishedSnapshotAccessor publishedSnapshotAccessor = GetPublishedSnapshotAccessor();
var publishedModelFactory = new NoopPublishedModelFactory();
var modelsBuilderSettings = Mock.Of<IOptions<ModelsBuilderSettings>>(x => x.Value == new ModelsBuilderSettings());
var editor = new BlockListPropertyValueConverter(
Mock.Of<IProfilingLogger>(),
new BlockEditorConverter(publishedSnapshotAccessor, publishedModelFactory), modelsBuilderSettings);
new BlockEditorConverter(publishedSnapshotAccessor, publishedModelFactory));
return editor;
}