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

V9: Fix missing EditedCultures and Name in content saving notifications (#12070)

Browse Source 
* Map dirty culture to EditedCultures before saving

And set the name of the content when setting default culture variant name

* Update src/Umbraco.Web.BackOffice/Controllers/ContentController.cs

Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>

Co-authored-by: nikolajlauridsen <nel@umbraco.dk>
Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
This commit is contained in:
Mole
2022-03-08 09:23:44 +01:00
committed by GitHub
parent 5d6fc6005c
commit 413a278373
1 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
View File

@@ -2122,21 +2122,34 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
}
var variantIndex = 0;
var defaultCulture = _allLangs.Value.Values.FirstOrDefault(x => x.IsDefault)?.IsoCode;
//loop through each variant, set the correct name and property values
// loop through each variant, set the correct name and property values
foreach (var variant in contentSave.Variants)
{
//Don't update anything for this variant if Save is not true
if (!variant.Save) continue;
// Don't update anything for this variant if Save is not true
if (!variant.Save)
{
continue;
}
//Don't update the name if it is empty
// Don't update the name if it is empty
if (!variant.Name.IsNullOrWhiteSpace())
{
if (contentSave.PersistedContent.ContentType.VariesByCulture())
{
if (variant.Culture.IsNullOrWhiteSpace())
{
throw new InvalidOperationException($"Cannot set culture name without a culture.");
}
contentSave.PersistedContent.SetCultureName(variant.Name, variant.Culture);
// If the variant culture is the default culture we also want to update the name on the Content itself.
if (variant.Culture.Equals(defaultCulture, StringComparison.InvariantCultureIgnoreCase))
{
contentSave.PersistedContent.Name = variant.Name;
}
}
else
{
@@ -2144,7 +2157,7 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
}
}
//This is important! We only want to process invariant properties with the first variant, for any other variant
// This is important! We only want to process invariant properties with the first variant, for any other variant
// we need to exclude invariant properties from being processed, otherwise they will be double processed for the
// same value which can cause some problems with things such as file uploads.
var propertyCollection = variantIndex == 0
@@ -2152,10 +2165,10 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
: new ContentPropertyCollectionDto
{
Properties = variant.PropertyCollectionDto.Properties.Where(
x => !x.Culture.IsNullOrWhiteSpace() || !x.Segment.IsNullOrWhiteSpace())
x => !x.Culture.IsNullOrWhiteSpace() || !x.Segment.IsNullOrWhiteSpace()),
};
//for each variant, map the property values
// for each variant, map the property values
MapPropertyValuesForPersistence<IContent, ContentItemSave>(
contentSave,
propertyCollection,
@@ -2176,6 +2189,12 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
variantIndex++;
}
// Map IsDirty cultures to edited cultures, to make it easier to verify changes on specific variants on Saving and Saved events.
IEnumerable<string> editedCultures = contentSave.PersistedContent.CultureInfos.Values
.Where(x => x.IsDirty())
.Select(x => x.Culture);
contentSave.PersistedContent.SetCultureEdited(editedCultures);
// handle template
if (string.IsNullOrWhiteSpace(contentSave.TemplateAlias)) // cleared: clear if not already null
{
@@ -2186,10 +2205,10 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
}
else // set: update if different
{
var template = _fileService.GetTemplate(contentSave.TemplateAlias);
if (template == null)
ITemplate template = _fileService.GetTemplate(contentSave.TemplateAlias);
if (template is null)
{
//ModelState.AddModelError("Template", "No template exists with the specified alias: " + contentItem.TemplateAlias);
// ModelState.AddModelError("Template", "No template exists with the specified alias: " + contentItem.TemplateAlias);
_logger.LogWarning("No template exists with the specified alias: {TemplateAlias}", contentSave.TemplateAlias);
}
else if (template.Id != contentSave.PersistedContent.TemplateId)