Rather than throw null ex's if culture not set - return the underlying source property (As used for both variant & invariant mapping in list views)

This commit is contained in:
Warren Buckley
2018-09-13 13:05:36 +01:00
parent c41bdccd5a
commit 082d6e6792

View File

@@ -99,7 +99,7 @@ namespace Umbraco.Web.Models.Mapping
//a culture needs to be in the context for a variant content item
if (culture == null)
throw new InvalidOperationException($"No culture found in mapping operation when one is required for a culture variant");
return source.UpdateDate;
var pubDate = source.GetPublishDate(culture);
return pubDate.HasValue ? pubDate.Value : source.UpdateDate;
@@ -114,7 +114,7 @@ namespace Umbraco.Web.Models.Mapping
//a culture needs to be in the context for a variant content item
if (culture == null)
throw new InvalidOperationException($"No culture found in mapping operation when one is required for a culture variant");
return source.Published;
return source.IsCulturePublished(culture);
}
@@ -128,7 +128,7 @@ namespace Umbraco.Web.Models.Mapping
//a culture needs to be in the context for a variant content item
if (culture == null)
throw new InvalidOperationException($"No culture found in mapping operation when one is required for a culture variant");
return source.Name;
if (source.CultureNames.TryGetValue(culture, out var name) && !string.IsNullOrWhiteSpace(name))
{