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

Prevent TermsFilter from having to deal with empty strings (#8727)

Browse Source 
* Prevent TermsFilter from having to deal with empty strings:
filter them out before parsing them to int
in form, convert taxonomies to OptionGroups rather than options with no value

* Update src/Orchard.Web/Modules/Orchard.Taxonomies/Projections/TermsFilter.cs

Co-authored-by: Sébastien Ros <sebastienros@gmail.com>

---------

Co-authored-by: Sébastien Ros <sebastienros@gmail.com>
This commit is contained in:
Matteo Piovanelli 2024-01-15 17:15:33 +01:00 committed by GitHub
parent 9644ceda1f
commit e013e00dd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,10 @@ namespace Orchard.Taxonomies.Projections {
var termIds = (string)context.State.TermIds; var termIds = (string)context.State.TermIds;
if (!String.IsNullOrEmpty(termIds)) { if (!String.IsNullOrEmpty(termIds)) {
var ids = termIds.Split(new[] { ',' }).Select(Int32.Parse).ToArray(); var ids = termIds.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
// Int32.Parse throws for empty strings
.Where(x => !string.IsNullOrWhiteSpace(x))
.Select(Int32.Parse).ToArray();
if (ids.Length == 0) { if (ids.Length == 0) {
return; return;

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

@ -57,7 +57,8 @@ namespace Orchard.Taxonomies.Projections {
); );
foreach (var taxonomy in _taxonomyService.GetTaxonomies()) { foreach (var taxonomy in _taxonomyService.GetTaxonomies()) {
f._Terms.Add(new SelectListItem { Value = String.Empty, Text = taxonomy.Name }); var tGroup = new SelectListGroup { Name = taxonomy.Name };
f._Terms.Add(tGroup);
foreach (var term in _taxonomyService.GetTerms(taxonomy.Id)) { foreach (var term in _taxonomyService.GetTerms(taxonomy.Id)) {
var gap = new string('-', term.GetLevels()); var gap = new string('-', term.GetLevels());
@ -65,7 +66,11 @@ namespace Orchard.Taxonomies.Projections {
gap += " "; gap += " ";
} }
f._Terms.Add(new SelectListItem { Value = term.Id.ToString(), Text = gap + term.Name }); f._Terms.Add(new SelectListItem {
Value = term.Id.ToString(),
Text = gap + term.Name,
Group = tGroup
});
} }
} }