From 932596cc479f637ed276d10b5a012b915da91e9e Mon Sep 17 00:00:00 2001 From: Andreas Jonsson Date: Fri, 24 Jan 2020 10:13:05 +0000 Subject: [PATCH] Bug 24506: Multibranch limit does not work with ElasticSearch 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 Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize --- catalogue/search.pl | 2 +- opac/opac-search.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/catalogue/search.pl b/catalogue/search.pl index 882a9eb052..819e93f828 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -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 '()'); } diff --git a/opac/opac-search.pl b/opac/opac-search.pl index f8a603f4af..452ea7dc15 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -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 '()'); } -- 2.39.5