From f4b16c70150a139a3600575ef3d113645c931e9c Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 29 Nov 2018 14:17:37 +0000 Subject: [PATCH] Bug 21911: Fix OPAC scoping to work with new group system To test: 0 - Apply patch 1 - Create a library group enabled for opac search limits and add some libraries 2 - Check the DB (or advanced search dropdown) to get the id of the group (using 7 as example below) 3 - Add to apache configuration (OPAC virtualhost) SetEnv OPAC_SEARCH_LIMIT branch:multibranchlimit-7 SetEnv OPAC_LIMIT_OVERRIDE 1 RequestHeader add X-Koha-SetEnv "OPAC_SEARCH_LIMIT branch:multibranchlimit-7" RequestHeader add X-Koha-SetEnv "OPAC_LIMIT_OVERRIDE 1" 4 - Ensure OpacAddMastheadLibraryPulldown is disabled 5 - Restart all the things 6 - Visit the opac 7 - Perform a search, confirm it is scoped to the branches in the group Signed-off-by: Martin Renvoize Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit 4c0682f5598d53992b6966a217b10f71a9cdaebb) Signed-off-by: Martin Renvoize (cherry picked from commit 647b853073bde006c0477c886a5cce727c3035a1) --- C4/Auth.pm | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 6b803487ae..ff94fdbec5 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -533,8 +533,8 @@ sub get_template_and_user { my $opac_limit_override = $ENV{'OPAC_LIMIT_OVERRIDE'}; my $opac_name = ''; if ( - ( $opac_limit_override && $opac_search_limit && $opac_search_limit =~ /branch:(\w+)/ ) || - ( $in->{'query'}->param('limit') && $in->{'query'}->param('limit') =~ /branch:(\w+)/ ) || + ( $opac_limit_override && $opac_search_limit && $opac_search_limit =~ /branch:([\w-]+)/ ) || + ( $in->{'query'}->param('limit') && $in->{'query'}->param('limit') =~ /branch:([\w-]+)/ ) || ( $in->{'query'}->param('multibranchlimit') && $in->{'query'}->param('multibranchlimit') =~ /multibranchlimit-(\w+)/ ) ) { $opac_name = $1; # opac_search_limit is a branch, so we use it. diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc index 098456301c..670244052e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -250,7 +250,11 @@ [% ELSE %] [% IF ( opac_limit_override ) %] [% IF ( opac_search_limit ) %] - + [% IF ( multibranchlimit = opac_search_limit.match( 'branch:(multibranchlimit-\d+)' ) ) %] + + [% ELSE %] + + [% END %] [% END %] [% ELSE %] [% IF ( mylibraryfirst ) %] -- 2.39.5