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

Fix for #11977 - Content Name auto-numbering correction (#11996)

Browse Source
This commit is contained in:
Robert Foster
2022-02-21 11:20:08 +11:00
committed by GitHub
parent a53d28310f
commit 06f2408ebc
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Umbraco.Infrastructure/Persistence/Repositories/Implement/SimilarNodeName.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text.RegularExpressions;
@@ -51,7 +51,22 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
}
}
// no suffix - name without suffix does NOT exist, AND name with suffix does NOT exist
// no suffix - name without suffix does NOT exist - we can just use the name without suffix.
if (!model.Suffix.HasValue && !items.SimpleNameExists(model.Text))
{
model.Suffix = StructuredName.NO_SUFFIX;
return model.FullName;
}
// suffix - name with suffix does NOT exist
// We can just return the full name as it is as there's no conflict.
if (model.Suffix.HasValue && !items.SimpleNameExists(model.FullName))
{
return model.FullName;
}
// no suffix - name without suffix does NOT exist, AND name with suffix does NOT exist
if (!model.Suffix.HasValue && !items.SimpleNameExists(model.Text) && !items.SuffixedNameExists())
{
model.Suffix = StructuredName.NO_SUFFIX;
@@ -163,7 +178,7 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
internal static readonly uint? NO_SUFFIX = default;
internal string Text { get; set; }
internal uint ? Suffix { get; set; }
internal uint? Suffix { get; set; }
public string FullName
{
get