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

Fixes - Fix publish/draft status for variant content when invariant properties are edited

Browse Source
This commit is contained in:
Robert
2019-01-07 16:23:26 +01:00
parent 4fa43abe23
commit e0511646af
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
View File

@@ -93,7 +93,8 @@ namespace Umbraco.Core.Persistence.Factories
return dto;
}
public static IEnumerable<PropertyDataDto> BuildDtos(int currentVersionId, int publishedVersionId, IEnumerable<Property> properties, ILanguageRepository languageRepository, out bool edited, out HashSet<string> editedCultures)
public static IEnumerable<PropertyDataDto> BuildDtos(int currentVersionId, int publishedVersionId, IEnumerable<Property> properties,
ILanguageRepository languageRepository, out bool edited, out HashSet<string> editedCultures, IEnumerable<string> availableCultures = null)
{
var propertyDataDtos = new List<PropertyDataDto>();
edited = false;
@@ -103,7 +104,8 @@ namespace Umbraco.Core.Persistence.Factories
{
if (property.PropertyType.IsPublishing)
{
var editingCultures = property.PropertyType.VariesByCulture();
var editingCultures = availableCultures?.Any() ?? property.PropertyType.VariesByCulture();
if (editingCultures && editedCultures == null) editedCultures = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
// publishing = deal with edit and published values
@@ -131,6 +133,15 @@ namespace Umbraco.Core.Persistence.Factories
{
editedCultures.Add(propertyValue.Culture); // report culture as edited
}
// flag culture as edited if it contains an edited invariant property
if (propertyValue.Culture == null &&
availableCultures !=null && !sameValues&&
editingCultures)
{
editedCultures.Add(availableCultures.FirstOrDefault());
}
}
}
else

3
src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
View File

@@ -527,7 +527,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
Database.Execute(deletePropertyDataSql);
// insert property data
var propertyDataDtos = PropertyFactory.BuildDtos(content.VersionId, publishing ? content.PublishedVersionId : 0, entity.Properties, LanguageRepository, out var edited, out var editedCultures);
var propertyDataDtos = PropertyFactory.BuildDtos(content.VersionId, publishing ? content.PublishedVersionId : 0,
entity.Properties, LanguageRepository, out var edited, out var editedCultures, content.AvailableCultures);
foreach (var propertyDataDto in propertyDataDtos)
Database.Insert(propertyDataDto);