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

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComposer.cs
This commit is contained in:
Shannon
2020-11-18 16:02:51 +11:00
parent 7e36bf55b5 dd5f400cf3
commit 99247d7fbe
153 changed files with 1147 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
View File

@@ -15,6 +15,7 @@ using Umbraco.Core.Models.Entities;
using Umbraco.Core.Models.Packaging;
using Umbraco.Core.PropertyEditors;
using Umbraco.Core.Scoping;
using Umbraco.Core.Serialization;
using Umbraco.Core.Services;
using Umbraco.Core.Services.Implement;
using Umbraco.Core.Strings;
@@ -34,6 +35,7 @@ namespace Umbraco.Core.Packaging
private readonly IShortStringHelper _shortStringHelper;
private readonly GlobalSettings _globalSettings;
private readonly ILocalizedTextService _localizedTextService;
private readonly IConfigurationEditorJsonSerializer _serializer;
private readonly IEntityService _entityService;
private readonly IContentTypeService _contentTypeService;
private readonly IContentService _contentService;
@@ -41,7 +43,7 @@ namespace Umbraco.Core.Packaging
public PackageDataInstallation(ILogger<PackageDataInstallation> logger, ILoggerFactory loggerFactory, IFileService fileService, IMacroService macroService, ILocalizationService localizationService,
IDataTypeService dataTypeService, IEntityService entityService, IContentTypeService contentTypeService,
IContentService contentService, PropertyEditorCollection propertyEditors, IScopeProvider scopeProvider, IShortStringHelper shortStringHelper, IOptions<GlobalSettings> globalSettings,
ILocalizedTextService localizedTextService)
ILocalizedTextService localizedTextService, IConfigurationEditorJsonSerializer serializer)
{
_logger = logger;
_loggerFactory = loggerFactory;
@@ -54,6 +56,7 @@ namespace Umbraco.Core.Packaging
_shortStringHelper = shortStringHelper;
_globalSettings = globalSettings.Value;
_localizedTextService = localizedTextService;
_serializer = serializer;
_entityService = entityService;
_contentTypeService = contentTypeService;
_contentService = contentService;
@@ -912,7 +915,7 @@ namespace Umbraco.Core.Packaging
if (!_propertyEditors.TryGet(editorAlias, out var editor))
editor = new VoidEditor(_loggerFactory, _dataTypeService, _localizationService, _localizedTextService, _shortStringHelper) { Alias = editorAlias };
var dataType = new DataType(editor)
var dataType = new DataType(editor, _serializer)
{
Key = dataTypeDefinitionId,
Name = dataTypeDefinitionName,
@@ -922,7 +925,7 @@ namespace Umbraco.Core.Packaging
var configurationAttributeValue = dataTypeElement.Attribute("Configuration")?.Value;
if (!string.IsNullOrWhiteSpace(configurationAttributeValue))
dataType.Configuration = editor.GetConfigurationEditor().FromDatabase(configurationAttributeValue);
dataType.Configuration = editor.GetConfigurationEditor().FromDatabase(configurationAttributeValue, _serializer);
dataTypes.Add(dataType);
}