gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 21249: (follow-up) Implement SearchLibraryLimit for individual library 

before this patch, the limit only applies to groups of libraries

Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>

Signed-off-by: David Cook <dcook@prosentient.com.au>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Aleisha Amohia 2021-02-24 10:48:10 +13:00 committed by Jonathan Druart
parent b85b33f28c
commit 1698c36a8e
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
catalogue/search.pl
View File

@ -399,6 +399,25 @@ if ( $params->{'multibranchlimit'} ) {
}
}
for ( my $i=0; $i<@limits; $i++ ) {
if ( $limits[$i] =~ /^branch:/ ) {
my $branchfield = C4::Context->preference('SearchLimitLibrary');
if ( $branchfield eq "homebranch" ) {
$limits[$i] =~ s/branch/homebranch/;
}
elsif ( $branchfield eq "holdingbranch" ) {
$limits[$i] =~ s/branch/holdingbranch/;
}
else {
my $homebranchlimit = $limits[$i];
my $holdingbranchlimit = $limits[$i];
$homebranchlimit =~ s/branch/homebranch/;
$holdingbranchlimit =~ s/branch/holdingbranch/;
$limits[$i] = "$homebranchlimit or $holdingbranchlimit";
}
}
}
my $available;
foreach my $limit(@limits) {
if ($limit =~/available/) {

19
opac/opac-search.pl
View File

@ -505,6 +505,25 @@ if ( $params->{'multibranchlimit'} || ( $branch_group_limit && $branch_group_lim
}
}
for ( my $i=0; $i<@limits; $i++ ) {
if ( $limits[$i] =~ /^branch:/ ) {
my $branchfield = C4::Context->preference('SearchLimitLibrary');
if ( $branchfield eq "homebranch" ) {
$limits[$i] =~ s/branch/homebranch/;
}
elsif ( $branchfield eq "holdingbranch" ) {
$limits[$i] =~ s/branch/holdingbranch/;
}
else {
my $homebranchlimit = $limits[$i];
my $holdingbranchlimit = $limits[$i];
$homebranchlimit =~ s/branch/homebranch/;
$holdingbranchlimit =~ s/branch/holdingbranch/;
$limits[$i] = "$homebranchlimit or $holdingbranchlimit";
}
}
}
my $available;
foreach my $limit(@limits) {
if ($limit =~/available/) {