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

(-)a/C4/Koha.pm (+6 lines)
Lines 754-759 sub getFacets { Link Here
754
                tags  => [ qw/ 440a 490a / ],
754
                tags  => [ qw/ 440a 490a / ],
755
                sep   => ', ',
755
                sep   => ', ',
756
            },
756
            },
757
			{
758
                idx   => 'itype',
759
                label => 'ItemTypes',
760
                tags  => [ qw/ 952y 942c / ],
761
                sep   => ', ',
762
            },
757
            ];
763
            ];
758
            my $library_facet;
764
            my $library_facet;
759
            $library_facet = {
765
            $library_facet = {
(-)a/C4/Search.pm (-2 / +13 lines)
Lines 288-294 sub SimpleSearch { Link Here
288
( undef, $results_hashref, \@facets_loop ) = getRecords (
288
( undef, $results_hashref, \@facets_loop ) = getRecords (
289
289
290
        $koha_query,       $simple_query, $sort_by_ref,    $servers_ref,
290
        $koha_query,       $simple_query, $sort_by_ref,    $servers_ref,
291
        $results_per_page, $offset,       $expanded_facet, $branches,
291
        $results_per_page, $offset,       $expanded_facet, $branches,$itemtypes,
292
        $query_type,       $scan
292
        $query_type,       $scan
293
    );
293
    );
294
294
Lines 302-308 See verbse embedded documentation. Link Here
302
sub getRecords {
302
sub getRecords {
303
    my (
303
    my (
304
        $koha_query,       $simple_query, $sort_by_ref,    $servers_ref,
304
        $koha_query,       $simple_query, $sort_by_ref,    $servers_ref,
305
        $results_per_page, $offset,       $expanded_facet, $branches,
305
        $results_per_page, $offset,       $expanded_facet, $branches,$itemtypes,
306
        $query_type,       $scan
306
        $query_type,       $scan
307
    ) = @_;
307
    ) = @_;
308
308
Lines 556-561 sub getRecords { Link Here
556
									$facet_label_value = "*";
556
									$facet_label_value = "*";
557
								}
557
								}
558
                            }
558
                            }
559
							# if it's a itemtype, label by the name, not the code,
560
							if ( $link_value =~ /itype/ ) {
561
								if (defined $itemtypes
562
									&& ref($itemtypes) eq "HASH"
563
									&& defined $itemtypes->{$one_facet}
564
									&& ref ($itemtypes->{$one_facet}) eq "HASH")
565
								{
566
									$facet_label_value =
567
										$itemtypes->{$one_facet}->{'description'};
568
								}
569
							}
559
570
560
                            # but we're down with the whole label being in the link's title.
571
                            # but we're down with the whole label being in the link's title.
561
                            push @this_facets_array, {
572
                            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 ) %]ItemTypes[% 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 ) %]ItemTypes[% 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