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

Merge branch 'v8/dev' into v8/feature/5170-IPublishedContent

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
This commit is contained in:
Shannon
2019-06-21 15:06:43 +10:00
parent 62e6168e03 37d3692cd0
commit c2cb85f1cd
137 changed files with 2017 additions and 1814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Models/Mapping/ContentVariantMapper.cs
View File

@@ -59,7 +59,7 @@ namespace Umbraco.Web.Models.Mapping
variants.Remove(defaultLang);
//Sort the remaining languages a-z
variants = variants.OrderBy(x => x.Name).ToList();
variants = variants.OrderBy(x => x.Language.Name).ToList();
//Insert the default language as the first item
variants.Insert(0, defaultLang);

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

@@ -45,6 +45,12 @@ namespace Umbraco.Web.Models.Mapping
if (source.NodeObjectType == Constants.ObjectTypes.Member && target.Icon.IsNullOrWhiteSpace())
target.Icon = "icon-user";
if (source.NodeObjectType == Constants.ObjectTypes.Media && source is IContentEntitySlim contentSlim)
source.AdditionalData["ContentTypeAlias"] = contentSlim.ContentTypeAlias;
if (source.NodeObjectType == Constants.ObjectTypes.Media && source is IMediaEntitySlim mediaSlim)
source.AdditionalData["MediaPath"] = mediaSlim.MediaPath;
// NOTE: we're mapping the objects in AdditionalData by object reference here.
// it works fine for now, but it's something to keep in mind in the future
foreach(var kvp in source.AdditionalData)