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

7
src/Umbraco.Infrastructure/Persistence/Repositories/Implement/ContentRepositoryBase.cs
View File

@@ -16,6 +16,7 @@ using Umbraco.Core.Persistence.Factories;
using Umbraco.Core.Persistence.Querying;
using Umbraco.Core.PropertyEditors;
using Umbraco.Core.Scoping;
using Umbraco.Core.Serialization;
using Umbraco.Core.Services;
using static Umbraco.Core.Persistence.SqlExtensionsStatics;
@@ -243,7 +244,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
/// <summary>
/// Updates tags for an item.
/// </summary>
protected void SetEntityTags(IContentBase entity, ITagRepository tagRepo)
protected void SetEntityTags(IContentBase entity, ITagRepository tagRepo, IJsonSerializer serializer)
{
foreach (var property in entity.Properties)
{
@@ -255,7 +256,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
var tags = new List<ITag>();
foreach (var pvalue in property.Values)
{
var tagsValue = property.GetTagsValue(PropertyEditors, DataTypeService, pvalue.Culture);
var tagsValue = property.GetTagsValue(PropertyEditors, DataTypeService, serializer, pvalue.Culture);
var languageId = LanguageRepository.GetIdByIsoCode(pvalue.Culture);
var cultureTags = tagsValue.Select(x => new Tag { Group = tagConfiguration.Group, Text = x, LanguageId = languageId });
tags.AddRange(cultureTags);
@@ -264,7 +265,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
}
else
{
var tagsValue = property.GetTagsValue(PropertyEditors, DataTypeService); // strings
var tagsValue = property.GetTagsValue(PropertyEditors, DataTypeService, serializer); // strings
var tags = tagsValue.Select(x => new Tag { Group = tagConfiguration.Group, Text = x });
tagRepo.Assign(entity.Id, property.PropertyTypeId, tags);
}