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

Fixes a couple issues, changes name from PublishValues to TryPublishValues

Browse Source
This commit is contained in:
Shannon
2018-04-26 21:37:29 +10:00
parent e99c519032
commit 23c40cbf2c
19 changed files with 208 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web/Models/Mapping/ContentItemDisplayNameResolver.cs
View File

@@ -1,4 +1,5 @@
using AutoMapper;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Web.Models.ContentEditing;
using ContentVariation = Umbraco.Core.Models.ContentVariation;
@@ -13,7 +14,12 @@ namespace Umbraco.Web.Models.Mapping
public string Resolve(IContent source, ContentItemDisplay destination, string destMember, ResolutionContext context)
{
var culture = context.GetCulture();
return source.GetName(culture);
if (culture != null && source.ContentType.Variations.Has(ContentVariation.CultureNeutral))
{
//return the culture name being requested
return source.GetName(culture);
}
return source.Name;
}
}
}