From 3737e834659481c0ca1134b5fa6ba8a5364dbba5 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 9 Jun 2015 21:51:44 -0400 Subject: [PATCH] Bug 14371: Facets should be sorted by label (displayed) not title (link value) This patch changes one small line in catalogue/search.pl and opac/opac-search to sort facets by: facet_label_value instead of facet_title_value To test: 1 - Perform a search with results in two branches e.g. Centerville (code CPL) and Fairfield (code FPL) 2 - Notice that branch facets appear correctly sorted 3 - Rename the branches Centervile->Zebra and Fairfeild->Aardvark (but don't change codes) 4 - Repeat original search 5 - Note that branch facets are no longer correctly sorted 6 - Apply patch 7 - Repeat search 8 - Facets should be correctly sorted 9 - Test in both staff and opac search 10 - Ensure there are no unintended consequences/regressions Signed-off-by: Bernardo Gonzalez Kriegel Work as described, staff AND opac No errors Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 219f7b5c8fe59034fc7aff1ab81e42bc8cb6eba2) Signed-off-by: Chris Cormack --- catalogue/search.pl | 2 +- opac/opac-search.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/catalogue/search.pl b/catalogue/search.pl index 4d165ace7c..006a1d45b9 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -536,7 +536,7 @@ eval { # This sorts the facets into alphabetical order if ($facets) { foreach my $f (@$facets) { - $f->{facets} = [ sort { uc($a->{facet_title_value}) cmp uc($b->{facet_title_value}) } @{ $f->{facets} } ]; + $f->{facets} = [ sort { uc($a->{facet_label_value}) cmp uc($b->{facet_label_value}) } @{ $f->{facets} } ]; } } if ($@ || $error) { diff --git a/opac/opac-search.pl b/opac/opac-search.pl index 2c4e34e2fd..81f2bbb4ef 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -579,7 +579,7 @@ if ($tag) { # This sorts the facets into alphabetical order if ($facets) { foreach my $f (@$facets) { - $f->{facets} = [ sort { uc($a->{facet_title_value}) cmp uc($b->{facet_title_value}) } @{ $f->{facets} } ]; + $f->{facets} = [ sort { uc($a->{facet_label_value}) cmp uc($b->{facet_label_value}) } @{ $f->{facets} } ]; } @$facets = sort {$a->{expand} cmp $b->{expand}} @$facets; } -- 2.39.5