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

Revert "Moved property type variation auto correct."

Browse Source 
This reverts commit 3858bd40ad.
This commit is contained in:
Daniël Knippers
2019-10-15 11:17:03 +02:00
parent 4a42b2fb43
commit 2b14408693
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepository.cs
View File

@@ -287,16 +287,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
entity.SortOrder = maxSortOrder + 1;
}
// Update property variations based on the content type variation
foreach (var propertyType in entity.PropertyTypes)
{
// Determine variation for the property type.
// The property is only considered culture variant when the base content type is also culture variant.
// The 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
propertyType.Variations = entity.Variations & propertyType.Variations;
}
PersistUpdatedBaseContentType(entity);
PersistTemplates(entity, true);

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

@@ -411,7 +411,15 @@ AND umbracoNode.id <> @id",
// note: this only deals with *local* property types, we're dealing w/compositions later below
foreach (var propertyType in entity.PropertyTypes)
{
// track each property individually
// Update property variations
// Determine target variation of the property type.
// The property is only considered culture variant when the base content type is also culture variant.
// The 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
propertyType.Variations = newContentTypeVariation & propertyType.Variations;
// then, track each property individually
if (propertyType.IsPropertyDirty("Variations"))
{
// allocate the list only when needed