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

fixes logic with publish due to flag enums

Browse Source
This commit is contained in:
Shannon
2019-03-29 00:32:52 +11:00
parent c67298dcd4
commit 28210896a8
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
View File

@@ -179,34 +179,26 @@ namespace Umbraco.Core.Models
if (!content.ContentType.SupportsPropertyVariation(culture.Culture, "*", true))
throw new NotSupportedException($"Culture \"{culture}\" is not supported by content type \"{content.ContentType.Alias}\" with variation \"{content.ContentType.Variations}\".");
switch (culture.CultureBehavior)
{
case CultureType.Behavior.AllCultures:
if (culture.CultureBehavior.HasFlag(CultureType.Behavior.AllCultures))
foreach (var c in content.AvailableCultures)
{
foreach (var c in content.AvailableCultures)
{
var name = content.GetCultureName(c);
if (string.IsNullOrWhiteSpace(name))
return false;
content.SetPublishInfo(c, name, DateTime.Now);
}
break;
}
case CultureType.Behavior.InvariantCulture:
{
if (string.IsNullOrWhiteSpace(content.Name))
return false;
// PublishName set by repository - nothing to do here
break;
}
case CultureType.Behavior.ExplicitCulture:
{
var name = content.GetCultureName(culture.Culture);
var name = content.GetCultureName(c);
if (string.IsNullOrWhiteSpace(name))
return false;
content.SetPublishInfo(culture.Culture, name, DateTime.Now);
break;
content.SetPublishInfo(c, name, DateTime.Now);
}
else if (culture.CultureBehavior.HasFlag(CultureType.Behavior.InvariantCulture))
{
if (string.IsNullOrWhiteSpace(content.Name))
return false;
// PublishName set by repository - nothing to do here
}
else if (culture.CultureBehavior.HasFlag(CultureType.Behavior.ExplicitCulture))
{
var name = content.GetCultureName(culture.Culture);
if (string.IsNullOrWhiteSpace(name))
return false;
content.SetPublishInfo(culture.Culture, name, DateTime.Now);
}
// property.PublishValues only publishes what is valid, variation-wise