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

Refactor variations

Browse Source
This commit is contained in:
Stephan
2018-06-20 14:18:57 +02:00
parent a697608529
commit ecf9a928d7
56 changed files with 1121 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web/PublishedCache/NuCache/Property.cs
View File

@@ -191,10 +191,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
if (culture != null && segment != null) return;
// use context values
// fixme CultureSegment?
var publishedVariationContext = _content.VariationContextAccessor?.VariationContext;
if (culture == null) culture = _variations.Has(ContentVariation.CultureNeutral) ? publishedVariationContext?.Culture : "";
if (segment == null) segment = _variations.Has(ContentVariation.CultureNeutral) ? publishedVariationContext?.Segment : "";
if (culture == null) culture = _variations.VariesByCulture() ? publishedVariationContext?.Culture : "";
if (segment == null) segment = _variations.VariesBySegment() ? publishedVariationContext?.Segment : "";
}
public override object GetValue(string culture = null, string segment = null)

6
src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
View File

@@ -178,7 +178,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
{
get
{
if (!ContentType.Variations.Has(ContentVariation.CultureNeutral)) // fixme CultureSegment?
if (!ContentType.VariesByCulture())
return _contentData.Name;
var culture = VariationContextAccessor.VariationContext.Culture;
@@ -194,7 +194,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
{
get
{
if (!ContentType.Variations.Has(ContentVariation.CultureNeutral)) // fixme CultureSegment?
if (!ContentType.VariesByCulture())
return _urlSegment;
var culture = VariationContextAccessor.VariationContext.Culture;
@@ -258,7 +258,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
{
get
{
if (!ContentType.Variations.Has(ContentVariation.CultureNeutral)) // fixme CultureSegment?
if (!ContentType.VariesByCulture())
return NoCultureInfos;
if (_cultureInfos != null) return _cultureInfos;

4
src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
View File

@@ -1188,13 +1188,13 @@ namespace Umbraco.Web.PublishedCache.NuCache
var names = content is IContent document
? (published
? document.PublishCultureNames
? document.PublishNames
: document.CultureNames)
: content.CultureNames;
foreach (var (culture, name) in names)
{
cultureData[culture] = new CultureVariation { Name = name, Date = content.GetCultureDate(culture) };
cultureData[culture] = new CultureVariation { Name = name, Date = content.GetCultureDate(culture) ?? DateTime.MinValue };
}
//the dictionary that will be serialized