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

Merge branch 'bug_10281' into 3.14-master

This commit is contained in:
Jared Camins-Esakov 2013-05-19 08:39:43 -04:00
parent 0e6a2440a0 cd281e4880
commit c07cd2e031
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
catalogue/search.pl
View File

@ -412,7 +412,8 @@ my @operands = $cgi->param('q');
my @limits = $cgi->param('limit');
if($params->{'multibranchlimit'}) {
push @limits, '('.join( " or ", map { "branch: $_ " } @{ GetBranchesInCategory( $params->{'multibranchlimit'} ) } ).')';
my $multibranch = '('.join( " or ", map { "branch: $_ " } @{ GetBranchesInCategory( $params->{'multibranchlimit'} ) } ).')';
push @limits, $multibranch if ($multibranch ne '()');
}
my $available;

10
opac/opac-search.pl
View File

@ -65,10 +65,13 @@ my $cgi = new CGI;
my $branch_group_limit = $cgi->param("branch_group_limit");
if ( $branch_group_limit ) {
if ( $branch_group_limit =~ /^multibranchlimit/ ) {
if ( $branch_group_limit =~ /^multibranchlimit-/ ) {
# For search groups we are going to convert this branch_group_limit CGI
# parameter into a multibranchlimit CGI parameter for the purposes of
# actually performing the query
$cgi->param(
-name => 'multibranchlimit',
-values => [ ( split( 'multibranchlimit-', $branch_group_limit ) )[1] ]
-values => substr($branch_group_limit, 17)
);
} else {
$cgi->append(
@ -403,7 +406,8 @@ my @limits = $cgi->param('limit');
@limits = map { uri_unescape($_) } @limits;
if($params->{'multibranchlimit'}) {
push @limits, '('.join( " or ", map { "branch: $_ " } @{ GetBranchesInCategory( $params->{'multibranchlimit'} ) } ).')';
my $multibranch = '('.join( " or ", map { "branch: $_ " } @{ GetBranchesInCategory( $params->{'multibranchlimit'} ) } ).')';
push @limits, $multibranch if ($multibranch ne '()');
}
my $available;