lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Implemented ability to add localizations of selected terms to filter (#8730)

Browse Source
This commit is contained in:
Matteo Piovanelli 2024-01-19 16:41:29 +01:00 committed by GitHub
parent d943fbd83e
commit 97648ed5a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Orchard.Web/Modules/Orchard.Taxonomies/Projections/TermsFilter.cs
View File

@ -6,6 +6,8 @@ using Orchard.Taxonomies.Services;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.Events; using Orchard.Events;
using Orchard.Localization; using Orchard.Localization;
using Orchard.Localization.Services;
using Orchard.Taxonomies.Drivers;
namespace Orchard.Taxonomies.Projections { namespace Orchard.Taxonomies.Projections {
public interface IFilterProvider : IEventHandler { public interface IFilterProvider : IEventHandler {
@ -14,10 +16,13 @@ namespace Orchard.Taxonomies.Projections {
public class TermsFilter : IFilterProvider { public class TermsFilter : IFilterProvider {
private readonly ITaxonomyService _taxonomyService; private readonly ITaxonomyService _taxonomyService;
private readonly IWorkContextAccessor _workContextAccessor;
private int _termsFilterId; private int _termsFilterId;
public TermsFilter(ITaxonomyService taxonomyService) { public TermsFilter(ITaxonomyService taxonomyService,
IWorkContextAccessor workContextAccessor) {
_taxonomyService = taxonomyService; _taxonomyService = taxonomyService;
_workContextAccessor = workContextAccessor;
T = NullLocalizer.Instance; T = NullLocalizer.Instance;
} }
@ -48,13 +53,30 @@ namespace Orchard.Taxonomies.Projections {
int op = Convert.ToInt32(context.State.Operator); int op = Convert.ToInt32(context.State.Operator);
var terms = ids.Select(_taxonomyService.GetTerm).ToList(); var terms = ids.Select(_taxonomyService.GetTerm).ToList();
bool.TryParse(context.State.TranslateTerms?.Value, out bool translateTerms);
if (translateTerms &&
_workContextAccessor.GetContext().TryResolve<ILocalizationService>(out var localizationService)) {
var localizedTerms = new List<TermPart>();
foreach (var termPart in terms) {
localizedTerms.AddRange(
localizationService.GetLocalizations(termPart)
.Select(l => l.As<TermPart>()));
}
terms.AddRange(localizedTerms);
terms = terms.Distinct(new TermPartComparer()).ToList();
}
var allChildren = new List<TermPart>(); var allChildren = new List<TermPart>();
bool.TryParse(context.State.ExcludeChildren?.Value, out bool excludeChildren);
foreach (var term in terms) { foreach (var term in terms) {
bool.TryParse(context.State.ExcludeChildren?.Value, out bool excludeChildren); if (term == null) {
if (!excludeChildren) continue;
}
allChildren.Add(term);
if (!excludeChildren) {
allChildren.AddRange(_taxonomyService.GetChildren(term)); allChildren.AddRange(_taxonomyService.GetChildren(term));
if (term != null) }
allChildren.Add(term);
} }
allChildren = allChildren.Distinct().ToList(); allChildren = allChildren.Distinct().ToList();

5
src/Orchard.Web/Modules/Orchard.Taxonomies/Projections/TermsFilterForms.cs
View File

@ -53,6 +53,11 @@ namespace Orchard.Taxonomies.Projections {
Id: "ExcludeChildren", Name: "ExcludeChildren", Id: "ExcludeChildren", Name: "ExcludeChildren",
Title: T("Automatically exclude children terms in filtering"), Title: T("Automatically exclude children terms in filtering"),
Value: "true" Value: "true"
),
_TranslateTerms: Shape.Checkbox(
Id: "TranslateTerms", Name: "TranslateTerms",
Title: T("Automatically include terms' localizations in filtering"),
Value: "true"
) )
); );