From 204edf1ecf62580f3db2a28ffbbda24ab5254d19 Mon Sep 17 00:00:00 2001 From: Ian Walls Date: Thu, 16 Feb 2012 12:09:44 -0500 Subject: [PATCH] Bug 7401 - Shelving Location facet instead of Branch facet when only 1 branch configured Signed-off-by: Kyle M Hall Enable for either A) SingleBranchMode is enabled or B) There is only one branch in the branches table --- C4/Branch.pm | 10 ++++ C4/Koha.pm | 55 ++++++++++++++------ C4/Search.pm | 7 ++- .../intranet-tmpl/prog/en/includes/facets.inc | 1 + .../opac-tmpl/prog/en/includes/opac-facets.inc | 1 + opac/opac-search.pl | 2 +- 6 files changed, 57 insertions(+), 19 deletions(-) diff --git a/C4/Branch.pm b/C4/Branch.pm index 7bd0326..2bdcae7 100644 --- a/C4/Branch.pm +++ b/C4/Branch.pm @@ -46,6 +46,7 @@ BEGIN { &DelBranchCategory &CheckCategoryUnique &mybranch + &GetBranchesCount ); @EXPORT_OK = qw( &onlymine &mybranch get_branch_code_from_name ); } @@ -580,6 +581,15 @@ sub get_branch_code_from_name { return $sth->fetchrow_array; } +sub GetBranchesCount { + my $dbh = C4::Context->dbh(); + my $query = "SELECT COUNT(*) AS branches_count FROM branches"; + my $sth = $dbh->prepare( $query ); + $sth->execute(); + my $row = $sth->fetchrow_hashref(); + return $row->{'branches_count'}; +} + 1; __END__ diff --git a/C4/Koha.pm b/C4/Koha.pm index 976b46a..6897fb7 100644 --- a/C4/Koha.pm +++ b/C4/Koha.pm @@ -23,6 +23,7 @@ package C4::Koha; use strict; #use warnings; FIXME - Bug 2505 use C4::Context; +use C4::Branch qw(GetBranchesCount); use Memoize; use vars qw($VERSION @ISA @EXPORT $DEBUG); @@ -711,15 +712,24 @@ sub getFacets { ]; my $library_facet; - - $library_facet = { - link_value => 'branch', - label_value => 'Libraries', - tags => [ '995', ], - subfield => 'b', - expanded => '1', - }; - push @$facets, $library_facet unless C4::Context->preference("singleBranchMode"); + unless ( C4::Context->preference("singleBranchMode") || GetBranchesCount() == 1 ) { + $library_facet = { + link_value => 'branch', + label_value => 'Libraries', + tags => [ '995', ], + subfield => 'b', + expanded => '1', + }; + } else { + $library_facet = { + link_value => 'location', + label_value => 'Location', + tags => [ '995' ], + subfield => 'c', + expanded => '1', + }; + } + push( @$facets, $library_facet ); } else { $facets = [ @@ -761,15 +771,26 @@ sub getFacets { subfield => 'a', }, ]; + my $library_facet; - $library_facet = { - link_value => 'branch', - label_value => 'Libraries', - tags => [ '952', ], - subfield => 'b', - expanded => '1', - }; - push @$facets, $library_facet unless C4::Context->preference("singleBranchMode"); + unless ( C4::Context->preference("singleBranchMode") || GetBranchesCount() == 1 ) { + $library_facet = { + link_value => 'branch', + label_value => 'Libraries', + tags => [ '952', ], + subfield => 'b', + expanded => '1', + }; + } else { + $library_facet = { + link_value => 'location', + label_value => 'Location', + tags => [ '952' ], + subfield => 'c', + expanded => '1', + }; + } + push( @$facets, $library_facet ); } return $facets; } diff --git a/C4/Search.pm b/C4/Search.pm index e86bb26..09a5134 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -303,7 +303,7 @@ sub getRecords { my ( $koha_query, $simple_query, $sort_by_ref, $servers_ref, $results_per_page, $offset, $expanded_facet, $branches, - $query_type, $scan + $query_type, $scan, $opac ) = @_; my @servers = @$servers_ref; @@ -564,6 +564,11 @@ sub getRecords { } } + # also, if it's a location code, use the name instead of the code + if ( $link_value =~ /location/ ) { + $facet_label_value = GetKohaAuthorisedValueLib('LOC', $one_facet, $opac) || '*'; + } + # but we're down with the whole label being in the link's title. push @this_facets_array, { facet_count => $facets_counter->{$link_value}->{$one_facet}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc index a72b586..bacbfaf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc @@ -16,6 +16,7 @@ [% IF ( facets_loo.type_label_Places ) %]Places[% END %] [% IF ( facets_loo.type_label_Series ) %]Series[% END %] [% IF ( facets_loo.type_label_Libraries ) %]Libraries[% END %] +[% IF ( facets_loo.type_label_Location ) %]Locations[% END %]