View | Details | Raw Unified | Return to bug 13789
Collapse All | Expand All

(-)a/catalogue/search.pl (-3 / +2 lines)
Lines 519-525 for my $this_cgi ( split('&',$limit_cgi) ) { Link Here
519
    my $input_name = $1;
519
    my $input_name = $1;
520
    my $input_value = $2;
520
    my $input_value = $2;
521
    $input_name =~ s/=$//;
521
    $input_name =~ s/=$//;
522
    push @limit_inputs, { input_name => $input_name, input_value => uri_unescape($input_value) };
522
    push @limit_inputs, { input_name => $input_name, input_value => Encode::decode_utf8( uri_unescape($input_value) ) };
523
}
523
}
524
$template->param ( LIMIT_INPUTS => \@limit_inputs );
524
$template->param ( LIMIT_INPUTS => \@limit_inputs );
525
525
Lines 723-734 my $gotopage = $cgi->param('gotoPage'); Link Here
723
$template->{'VARS'}->{'gotoPage'} = $gotopage
723
$template->{'VARS'}->{'gotoPage'} = $gotopage
724
  if $gotopage =~ m/^(ISBD|labeledMARC|MARC|more)?detail.pl$/;
724
  if $gotopage =~ m/^(ISBD|labeledMARC|MARC|more)?detail.pl$/;
725
725
726
my @input_values = map { Encode::decode_utf8($_->{input_value}) } @limit_inputs;
727
for my $facet ( @$facets ) {
726
for my $facet ( @$facets ) {
728
    for my $entry ( @{ $facet->{facets} } ) {
727
    for my $entry ( @{ $facet->{facets} } ) {
729
        my $index = $entry->{type_link_value};
728
        my $index = $entry->{type_link_value};
730
        my $value = $entry->{facet_link_value};
729
        my $value = $entry->{facet_link_value};
731
        $entry->{active} = grep { $_ eq qq{$index:$value} } @input_values;
730
        $entry->{active} = grep { $_->{input_value} eq qq{$index:$value} } @limit_inputs;
732
    }
731
    }
733
}
732
}
734
733
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc (-7 / +7 lines)
Lines 23-39 Link Here
23
<ul>
23
<ul>
24
  [% FOREACH facet IN facets_loo.facets %]
24
  [% FOREACH facet IN facets_loo.facets %]
25
    <li>
25
    <li>
26
      [% SET query_cgi_f = query_cgi | html %]
26
      [% SET url = "/cgi-bin/koha/catalogue/search.pl?" _ query_cgi _ limit_cgi %]
27
      [% SET limit_cgi_f = limit_cgi | html %]
28
      [% SET url = "/cgi-bin/koha/catalogue/search.pl?" _ query_cgi_f _ limit_cgi_f %]
29
      [% IF ( sort_by ) %]
27
      [% IF ( sort_by ) %]
30
        [% SET url = url _ "&amp;sort_by=" _ sort_by %]
28
        [% url = BLOCK %][% url %][% "&amp;sort_by=" _ sort_by |url %][% END %]
31
      [% END %]
29
      [% END %]
32
      [% facet.facet_link_value = BLOCK %][% facet.facet_link_value | uri %][% END %]
33
      [% IF facet.active %]
30
      [% IF facet.active %]
34
        [% SET url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
31
        [% SET url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
35
        <span class="facet-label">[% facet.facet_label_value %]</span>
32
        <span class="facet-label">[% facet.facet_label_value %]</span>
36
        [<a href="[% url |url%]" title="Remove facet [% facet.facet_title_value | html %]">x</a>]
33
        [<a href="[% url %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
37
      [% ELSE %]
34
      [% ELSE %]
38
        [% SET url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
35
        [% SET url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
39
        <span class="facet-label"><a href="[% url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a></span>
36
        <span class="facet-label"><a href="[% url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a></span>
Lines 44-50 Link Here
44
    </li>
41
    </li>
45
  [% END %]
42
  [% END %]
46
  [% IF ( facets_loo.expandable ) %]
43
  [% IF ( facets_loo.expandable ) %]
47
    <li class="showmore"><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url%][% END %][% IF ( offset ) %]&amp;offset=[% offset %][% END %]&amp;expand=[% facets_loo.expand %]#[% facets_loo.type_id %]">Show more</a></li>
44
      <li class="showmore">
45
          <a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi %][% limit_cgi |url %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF ( offset ) %]
46
                  &amp;offset=[% offset |url %][% END %]&amp;expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a>
47
      </li>
48
  [% END %]
48
  [% END %]
49
</ul></li>
49
</ul></li>
50
[% END %]
50
[% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc (-7 / +4 lines)
Lines 32-51 Link Here
32
                        <ul>
32
                        <ul>
33
                            [% FOREACH facet IN facets_loo.facets %]
33
                            [% FOREACH facet IN facets_loo.facets %]
34
                                <li>
34
                                <li>
35
                                  [% SET query_cgi_f = query_cgi %]
35
                                  [% SET url = "/cgi-bin/koha/opac-search.pl?" _ query_cgi _ limit_cgi %]
36
                                  [% SET limit_cgi_f = limit_cgi | url %]
37
                                  [% SET url = "/cgi-bin/koha/opac-search.pl?" _ query_cgi_f _ limit_cgi_f %]
38
                                  [% IF ( sort_by ) %]
36
                                  [% IF ( sort_by ) %]
39
                                    [% SET url = url _ "&amp;sort_by=" _ sort_by |url %]
37
                                    [% url = BLOCK %][% url %][% "&amp;sort_by=" _ sort_by |url %][% END %]
40
                                  [% END %]
38
                                  [% END %]
41
                                  [% facet.facet_link_value = BLOCK %][% facet.facet_link_value | uri %][% END %]
42
                                  [% IF facet.active %]
39
                                  [% IF facet.active %]
43
                                    [% SET url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
40
                                    [% SET url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
44
                                    <span class="facet-label">[% facet.facet_label_value %]</span>
41
                                    <span class="facet-label">[% facet.facet_label_value %]</span>
45
                                    [<a href="[% url |url%]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
42
                                    [<a href="[% url %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
46
                                  [% ELSE %]
43
                                  [% ELSE %]
47
                                    [% SET url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
44
                                    [% SET url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
48
                                    <span class="facet-label"><a href="[% url |url%]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a></span>
45
                                    <span class="facet-label"><a href="[% url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a></span>
49
                                    [% IF ( displayFacetCount ) %]
46
                                    [% IF ( displayFacetCount ) %]
50
                                      <span class="facet-count"> ([% facet.facet_count %])</span>
47
                                      <span class="facet-count"> ([% facet.facet_count %])</span>
51
                                    [% END %]
48
                                    [% END %]
(-)a/opac/opac-search.pl (-3 / +1 lines)
Lines 872-883 for (my $i=0;$i<@servers;$i++) { Link Here
872
} #/end of the for loop
872
} #/end of the for loop
873
#$template->param(FEDERATED_RESULTS => \@results_array);
873
#$template->param(FEDERATED_RESULTS => \@results_array);
874
874
875
my @input_values = map { Encode::decode_utf8($_->{input_value}) } @limit_inputs;
876
for my $facet ( @$facets ) {
875
for my $facet ( @$facets ) {
877
    for my $entry ( @{ $facet->{facets} } ) {
876
    for my $entry ( @{ $facet->{facets} } ) {
878
        my $index = $entry->{type_link_value};
877
        my $index = $entry->{type_link_value};
879
        my $value = $entry->{facet_link_value};
878
        my $value = $entry->{facet_link_value};
880
        $entry->{active} = grep { $_ eq qq{$index:$value} } @input_values;
879
        $entry->{active} = grep { $_->{input_value} eq qq{$index:$value} } @limit_inputs;
881
    }
880
    }
882
}
881
}
883
882
884
- 

Return to bug 13789