Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix taxonomy field multiselect mode tags automatic sorting problem #17481

Merged
merged 1 commit into from
Feb 13, 2025
Merged

fix taxonomy field multiselect mode tags automatic sorting problem #17481

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 23 additions & 18 deletions src/OrchardCore.Modules/OrchardCore.Taxonomies/Drivers/TaxonomyFieldDriverHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,34 @@ public static class TaxonomyFieldDriverHelper
/// </summary>
public static void PopulateTermEntries(List<TermEntry> termEntries, TaxonomyField field, IEnumerable<ContentItem> contentItems, int level)
{
foreach (var contentItem in contentItems)
foreach (var selectedTermContentItemId in field.TermContentItemIds)
{
var children = Array.Empty<ContentItem>();

if (((JsonObject)contentItem.Content)["Terms"] is JsonArray termsArray)
if (contentItems.Any(x => x.ContentItemId == selectedTermContentItemId))
{
children = termsArray.ToObject<ContentItem[]>();
}
var contentItem = contentItems.First(x => x.ContentItemId == selectedTermContentItemId);

var termEntry = new TermEntry
{
Term = contentItem,
ContentItemId = contentItem.ContentItemId,
Selected = field.TermContentItemIds.Contains(contentItem.ContentItemId),
Level = level,
IsLeaf = children.Length == 0
};
var children = Array.Empty<ContentItem>();

termEntries.Add(termEntry);
if (((JsonObject)contentItem.Content)["Terms"] is JsonArray termsArray)
{
children = termsArray.ToObject<ContentItem[]>();
}

if (children.Length > 0)
{
PopulateTermEntries(termEntries, field, children, level + 1);
var termEntry = new TermEntry
{
Term = contentItem,
ContentItemId = contentItem.ContentItemId,
Selected = field.TermContentItemIds.Contains(contentItem.ContentItemId),
Level = level,
IsLeaf = children.Length == 0
};

termEntries.Add(termEntry);

if (children.Length > 0)
{
PopulateTermEntries(termEntries, field, children, level + 1);
}
}
}
}
Expand Down