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

Merge branch 'v8/8.6' into v8/8.7

Browse Source
This commit is contained in:
Sebastiaan Janssen
2021-01-11 11:34:44 +01:00
parent 6d4990ad48 3914be43b8
commit e249c4f68d
2 changed files with 90 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
View File

@@ -448,8 +448,14 @@ AND umbracoNode.id <> @id",
// The composed property is only considered segment variant when the base content type is also segment variant.
// Example: Culture variant content type with a Culture+Segment variant property type will become ContentVariation.Culture
var target = newContentTypeVariation & composedPropertyType.Variations;
// Determine the previous variation
// We have to compare with the old content type variation because the composed property might already have changed
// Example: A property with variations in an element type with variations is used in a document without
// when you enable variations the property has already enabled variations from the element type,
// but it's still a change from nothing because the document did not have variations, but it does now.
var from = oldContentTypeVariation & composedPropertyType.Variations;
propertyTypeVariationChanges[composedPropertyType.Id] = (composedPropertyType.Variations, target);
propertyTypeVariationChanges[composedPropertyType.Id] = (from, target);
}
}