@@ -, +, @@
now results
/cgi-bin/koha/opac-search.pl?q=123&sort_by='">&limit=123
and verifying that you DON'T see prompt window in your browser
---
catalogue/search.pl | 5 ++---
.../intranet-tmpl/prog/en/includes/facets.inc | 14 +++++++-------
.../bootstrap/en/includes/opac-facets.inc | 11 ++++-------
opac/opac-search.pl | 3 +--
4 files changed, 14 insertions(+), 19 deletions(-)
--- a/catalogue/search.pl
+++ a/catalogue/search.pl
@@ -519,7 +519,7 @@ for my $this_cgi ( split('&',$limit_cgi) ) {
my $input_name = $1;
my $input_value = $2;
$input_name =~ s/=$//;
- push @limit_inputs, { input_name => $input_name, input_value => uri_unescape($input_value) };
+ push @limit_inputs, { input_name => $input_name, input_value => Encode::decode_utf8( uri_unescape($input_value) ) };
}
$template->param ( LIMIT_INPUTS => \@limit_inputs );
@@ -723,12 +723,11 @@ my $gotopage = $cgi->param('gotoPage');
$template->{'VARS'}->{'gotoPage'} = $gotopage
if $gotopage =~ m/^(ISBD|labeledMARC|MARC|more)?detail.pl$/;
-my @input_values = map { Encode::decode_utf8($_->{input_value}) } @limit_inputs;
for my $facet ( @$facets ) {
for my $entry ( @{ $facet->{facets} } ) {
my $index = $entry->{type_link_value};
my $value = $entry->{facet_link_value};
- $entry->{active} = grep { $_ eq qq{$index:$value} } @input_values;
+ $entry->{active} = grep { $_->{input_value} eq qq{$index:$value} } @limit_inputs;
}
}
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
@@ -23,17 +23,14 @@
[% FOREACH facet IN facets_loo.facets %]
-
- [% SET query_cgi_f = query_cgi | html %]
- [% SET limit_cgi_f = limit_cgi | html %]
- [% SET url = "/cgi-bin/koha/catalogue/search.pl?" _ query_cgi_f _ limit_cgi_f %]
+ [% SET url = "/cgi-bin/koha/catalogue/search.pl?" _ query_cgi _ limit_cgi %]
[% IF ( sort_by ) %]
- [% SET url = url _ "&sort_by=" _ sort_by %]
+ [% url = BLOCK %][% url %][% "&sort_by=" _ sort_by |url %][% END %]
[% END %]
- [% facet.facet_link_value = BLOCK %][% facet.facet_link_value | uri %][% END %]
[% IF facet.active %]
[% SET url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
[% facet.facet_label_value %]
- [x]
+ [x]
[% ELSE %]
[% SET url = url _ "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
[% facet.facet_label_value %]
@@ -44,7 +41,10 @@
[% END %]
[% IF ( facets_loo.expandable ) %]
- - Show more
+ -
+ Show more
+
[% END %]
[% END %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
@@ -32,20 +32,17 @@
[% FOREACH facet IN facets_loo.facets %]
-
- [% SET query_cgi_f = query_cgi %]
- [% SET limit_cgi_f = limit_cgi | url %]
- [% SET url = "/cgi-bin/koha/opac-search.pl?" _ query_cgi_f _ limit_cgi_f %]
+ [% SET url = "/cgi-bin/koha/opac-search.pl?" _ query_cgi _ limit_cgi %]
[% IF ( sort_by ) %]
- [% SET url = url _ "&sort_by=" _ sort_by |url %]
+ [% url = BLOCK %][% url %][% "&sort_by=" _ sort_by |url %][% END %]
[% END %]
- [% facet.facet_link_value = BLOCK %][% facet.facet_link_value | uri %][% END %]
[% IF facet.active %]
[% SET url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
[% facet.facet_label_value %]
- [x]
+ [x]
[% ELSE %]
[% SET url = url _ "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
- [% facet.facet_label_value %]
+ [% facet.facet_label_value %]
[% IF ( displayFacetCount ) %]
([% facet.facet_count %])
[% END %]
--- a/opac/opac-search.pl
+++ a/opac/opac-search.pl
@@ -872,12 +872,11 @@ for (my $i=0;$i<@servers;$i++) {
} #/end of the for loop
#$template->param(FEDERATED_RESULTS => \@results_array);
-my @input_values = map { Encode::decode_utf8($_->{input_value}) } @limit_inputs;
for my $facet ( @$facets ) {
for my $entry ( @{ $facet->{facets} } ) {
my $index = $entry->{type_link_value};
my $value = $entry->{facet_link_value};
- $entry->{active} = grep { $_ eq qq{$index:$value} } @input_values;
+ $entry->{active} = grep { $_->{input_value} eq qq{$index:$value} } @limit_inputs;
}
}
--