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

Merge remote-tracking branch 'origin/v8/dev' into netcore/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
#	src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
#	src/Umbraco.Tests/Models/PropertyTypeTests.cs
This commit is contained in:
Bjarke Berg
2020-03-10 07:44:22 +01:00
parent be753754a4 d3ebdb6198
commit 9d6762fb6a
51 changed files with 221 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
View File

@@ -175,6 +175,12 @@ namespace Umbraco.Web.Models.Mapping
target.Name = source.Values.ContainsKey(UmbracoExamineFieldNames.NodeNameFieldName) ? source.Values[UmbracoExamineFieldNames.NodeNameFieldName] : "[no name]";
var culture = context.GetCulture();
if(culture.IsNullOrWhiteSpace() == false)
{
target.Name = source.Values.ContainsKey($"nodeName_{culture}") ? source.Values[$"nodeName_{culture}"] : target.Name;
}
if (source.Values.TryGetValue(UmbracoExamineFieldNames.UmbracoFileFieldName, out var umbracoFile))
{
if (umbracoFile != null)

1
src/Umbraco.Infrastructure/Models/PropertyType.cs
View File

@@ -168,6 +168,7 @@ namespace Umbraco.Core.Models
/// <inheritdoc />
[DataMember]
[DoNotClone]
public Lazy<int> PropertyGroupId
{
get => _propertyGroupId;