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

(-)a/C4/Koha.pm (+6 lines)
Lines 760-765 sub getFacets { Link Here
760
                tags  => [ qw/ 440a 490a / ],
760
                tags  => [ qw/ 440a 490a / ],
761
                sep   => ', ',
761
                sep   => ', ',
762
            },
762
            },
763
			{
764
                idx   => 'itype',
765
                label => 'ItemTypes',
766
                tags  => [ qw/ 952y 942c / ],
767
                sep   => ', ',
768
            },
763
            ];
769
            ];
764
            my $library_facet;
770
            my $library_facet;
765
            $library_facet = {
771
            $library_facet = {
(-)a/C4/Search.pm (-2 / +13 lines)
Lines 287-293 sub SimpleSearch { Link Here
287
( undef, $results_hashref, \@facets_loop ) = getRecords (
287
( undef, $results_hashref, \@facets_loop ) = getRecords (
288
288
289
        $koha_query,       $simple_query, $sort_by_ref,    $servers_ref,
289
        $koha_query,       $simple_query, $sort_by_ref,    $servers_ref,
290
        $results_per_page, $offset,       $expanded_facet, $branches,
290
        $results_per_page, $offset,       $expanded_facet, $branches,$itemtypes,
291
        $query_type,       $scan
291
        $query_type,       $scan
292
    );
292
    );
293
293
Lines 301-307 See verbse embedded documentation. Link Here
301
sub getRecords {
301
sub getRecords {
302
    my (
302
    my (
303
        $koha_query,       $simple_query, $sort_by_ref,    $servers_ref,
303
        $koha_query,       $simple_query, $sort_by_ref,    $servers_ref,
304
        $results_per_page, $offset,       $expanded_facet, $branches,
304
        $results_per_page, $offset,       $expanded_facet, $branches,$itemtypes,
305
        $query_type,       $scan
305
        $query_type,       $scan
306
    ) = @_;
306
    ) = @_;
307
307
Lines 555-560 sub getRecords { Link Here
555
									$facet_label_value = "*";
555
									$facet_label_value = "*";
556
								}
556
								}
557
                            }
557
                            }
558
							# if it's a itemtype, label by the name, not the code,
559
							if ( $link_value =~ /itype/ ) {
560
								if (defined $itemtypes
561
									&& ref($itemtypes) eq "HASH"
562
									&& defined $itemtypes->{$one_facet}
563
									&& ref ($itemtypes->{$one_facet}) eq "HASH")
564
								{
565
									$facet_label_value =
566
										$itemtypes->{$one_facet}->{'description'};
567
								}
568
							}
558
569
559
                            # but we're down with the whole label being in the link's title.
570
                            # but we're down with the whole label being in the link's title.
560
                            push @this_facets_array, {
571
                            push @this_facets_array, {
(-)a/catalogue/search.pl (-1 / +1 lines)
Lines 529-535 if (C4::Context->preference('NoZebra')) { Link Here
529
    };
529
    };
530
} else {
530
} else {
531
    eval {
531
    eval {
532
        ($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);
532
        ($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$itemtypes,$query_type,$scan);
533
    };
533
    };
534
}
534
}
535
# This sorts the facets into alphabetical order
535
# This sorts the facets into alphabetical order
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc (+1 lines)
Lines 15-20 Link Here
15
[% IF ( facets_loo.type_label_Topics ) %]Topics[% END %]
15
[% IF ( facets_loo.type_label_Topics ) %]Topics[% END %]
16
[% IF ( facets_loo.type_label_Places ) %]Places[% END %]
16
[% IF ( facets_loo.type_label_Places ) %]Places[% END %]
17
[% IF ( facets_loo.type_label_Series ) %]Series[% END %]
17
[% IF ( facets_loo.type_label_Series ) %]Series[% END %]
18
[% IF ( facets_loo.type_label_ItemTypes ) %]Item types[% END %]
18
[% IF ( facets_loo.type_label_Libraries ) %]Libraries[% END %]
19
[% IF ( facets_loo.type_label_Libraries ) %]Libraries[% END %]
19
<ul>
20
<ul>
20
        [% FOREACH facet IN facets_loo.facets %]<li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by %][% END %]&amp;limit=[% facet.type_link_value %]:[% facet.facet_link_value %]" title="[% facet.facet_title_value %]">[% facet.facet_label_value %]</a> [% IF ( displayFacetCount ) %]([% facet.facet_count %])[% END %]</li>[% END %][% IF ( facets_loo.expandable ) %]
21
        [% FOREACH facet IN facets_loo.facets %]<li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by %][% END %]&amp;limit=[% facet.type_link_value %]:[% facet.facet_link_value %]" title="[% facet.facet_title_value %]">[% facet.facet_label_value %]</a> [% IF ( displayFacetCount ) %]([% facet.facet_count %])[% END %]</li>[% END %][% IF ( facets_loo.expandable ) %]
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc (+1 lines)
Lines 14-19 Link Here
14
[% IF ( facets_loo.type_label_Topics ) %]Topics[% END %]
14
[% IF ( facets_loo.type_label_Topics ) %]Topics[% END %]
15
[% IF ( facets_loo.type_label_Places ) %]Places[% END %]
15
[% IF ( facets_loo.type_label_Places ) %]Places[% END %]
16
[% IF ( facets_loo.type_label_Series ) %]Series[% END %]
16
[% IF ( facets_loo.type_label_Series ) %]Series[% END %]
17
[% IF ( facets_loo.type_label_ItemTypes ) %]Item types[% END %]
17
[% UNLESS ( singleBranchMode ) %]
18
[% UNLESS ( singleBranchMode ) %]
18
[% IF ( facets_loo.type_label_Libraries ) %]Libraries[% END %]
19
[% IF ( facets_loo.type_label_Libraries ) %]Libraries[% END %]
19
[% END %]
20
[% END %]
(-)a/opac/opac-search.pl (-2 / +1 lines)
Lines 475-481 elsif (C4::Context->preference('NoZebra')) { Link Here
475
    $pasarParams .= '&amp;simple_query=' . $simple_query;
475
    $pasarParams .= '&amp;simple_query=' . $simple_query;
476
    $pasarParams .= '&amp;query_type=' . $query_type if ($query_type);
476
    $pasarParams .= '&amp;query_type=' . $query_type if ($query_type);
477
    eval {
477
    eval {
478
        ($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);
478
        ($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$itemtypes,$query_type,$scan);
479
    };
479
    };
480
}
480
}
481
# This sorts the facets into alphabetical order
481
# This sorts the facets into alphabetical order
482
- 

Return to bug 4255