Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 24506: Multibranch limit does not work with ElasticSearch

Browse source 
Test plan
1. Set up a system with ElasticSearch
2. Set up or make sure ther are at least two branches
3. create a group of branches
4. make sure there are items associated with any library in the group
5. make a search in opac limited by the library group
6. make an advanced search in intra limited by the library group
7. change SearchEngine system preference to Zebra and repeat 5. and 6.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Andreas Jonsson 2020-01-24 10:13:05 +00:00 committed by Martin Renvoize
parent 6fcbf109d6
commit 932596cc47
Signed by: martin.renvoize
GPG key ID: 422B469130441A0F
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
catalogue/search.pl
View file

@ -423,7 +423,7 @@ my %is_nolimit = map { $_ => 1 } @nolimits;
if($params->{'multibranchlimit'}) {
my $search_group = Koha::Library::Groups->find( $params->{multibranchlimit} );
my @libraries = $search_group->all_libraries;
my $multibranch = '('.join( " or ", map { 'branch: ' . $_->branchcode } @libraries ) .')';
my $multibranch = '('.join( " OR ", map { '(homebranch: ' . $_->branchcode .')' } @libraries ) .')';
push @limits, $multibranch if ($multibranch ne '()');
}

2
opac/opac-search.pl
View file

@ -504,7 +504,7 @@ if (@searchCategories > 0) {
if($params->{'multibranchlimit'}) {
my $search_group = Koha::Library::Groups->find( $params->{multibranchlimit} );
my @libraries = $search_group->all_libraries;
my $multibranch = '('.join( " or ", map { 'branch: ' . $_->branchcode } @libraries ) .')';
my $multibranch = '('.join( " OR ", map { 'homebranch: ' . $_->branchcode } @libraries ) .')';
push @limits, $multibranch if ($multibranch ne '()');
}