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

Properly set / unset Culture flag instead of removing _all_ flags when "Vary by Culture" is false.

Browse Source
This commit is contained in:
Daniël Knippers
2019-10-15 09:28:25 +02:00
parent 81d70cb5a8
commit 1a92dbfd8f
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
View File

@@ -223,7 +223,11 @@ namespace Umbraco.Web.Models.Mapping
target.DataTypeKey = source.DataTypeKey;
target.Mandatory = source.Validation.Mandatory;
target.ValidationRegExp = source.Validation.Pattern;
target.Variations = source.AllowCultureVariant ? ContentVariation.Culture : ContentVariation.Nothing;
target.Variations = source.AllowCultureVariant
// Set culture flag
? target.Variations | ContentVariation.Culture
// Unset culture flag
: target.Variations & ~ContentVariation.Culture;
if (source.Id > 0)
target.Id = source.Id;
@@ -395,9 +399,11 @@ namespace Umbraco.Web.Models.Mapping
if (!(target is IMemberType))
{
target.Variations = ContentVariation.Nothing;
if (source.AllowCultureVariant)
target.Variations |= ContentVariation.Culture;
target.Variations = source.AllowCultureVariant
// Set culture flag
? target.Variations | ContentVariation.Culture
// Unset culture flag
: target.Variations & ~ContentVariation.Culture;
}
// handle property groups and property types