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

Check if language has changed when updating domains (#17790)

Browse Source
This commit is contained in:
Nikolaj Geisle
2024-12-12 08:47:35 +01:00
committed by GitHub
parent 4f6fda796f
commit 64982a1afd
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Core/Services/DomainService.cs
View File

@@ -311,12 +311,17 @@ public class DomainService : RepositoryService, IDomainService
var sortOrder = 0;
foreach (DomainModel domainModel in updateModel.Domains)
{
IDomain assignedDomain = currentlyAssignedDomains.FirstOrDefault(domain => domainModel.DomainName.InvariantEquals(domain.DomainName))
?? new UmbracoDomain(domainModel.DomainName)
{
LanguageId = languageIdByIsoCode[domainModel.IsoCode],
RootContentId = contentId
};
IDomain? assignedDomain = currentlyAssignedDomains.FirstOrDefault(domain => domainModel.DomainName.InvariantEquals(domain.DomainName));
// If we do not have an assigned domain, or the domain-language has been changed, create new domain.
if (assignedDomain is null || assignedDomain.LanguageId != languageIdByIsoCode[domainModel.IsoCode])
{
assignedDomain = new UmbracoDomain(domainModel.DomainName)
{
LanguageId = languageIdByIsoCode[domainModel.IsoCode],
RootContentId = contentId
};
}
assignedDomain.SortOrder = sortOrder++;
newAssignedDomains.Add(assignedDomain);