Delivered-To: jcamins@cpbibliography.com Received: by 10.43.69.79 with SMTP id yb15cs86043icb; Mon, 21 Mar 2011 14:18:43 -0700 (PDT) Received: by 10.204.82.224 with SMTP id c32mr4168851bkl.161.1300742322540; Mon, 21 Mar 2011 14:18:42 -0700 (PDT) Return-Path: Received: from eliot.biblibre.com (eliot.biblibre.com [188.165.204.78]) by mx.google.com with ESMTPS id v10si18124833bku.90.2011.03.21.14.18.40 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 21 Mar 2011 14:18:41 -0700 (PDT) Received-SPF: neutral (google.com: 188.165.204.78 is neither permitted nor denied by best guess record for domain of koha-patches-bounces@lists.koha-community.org) client-ip=188.165.204.78; Authentication-Results: mx.google.com; spf=neutral (google.com: 188.165.204.78 is neither permitted nor denied by best guess record for domain of koha-patches-bounces@lists.koha-community.org) smtp.mail=koha-patches-bounces@lists.koha-community.org Received: from eliot.biblibre.com (localhost.localdomain [127.0.0.1]) by eliot.biblibre.com (Postfix) with ESMTP id 4021646DD8; Mon, 21 Mar 2011 22:18:40 +0100 (CET) X-Original-To: koha-patches@lists.koha-community.org Delivered-To: koha-patches_lists.koha-community.org@eliot.biblibre.com Received: from dev.bywatersolutions.com (dev.bywatersolutions.com [174.143.239.187]) by eliot.biblibre.com (Postfix) with ESMTP id 5E36E467F4 for ; Mon, 21 Mar 2011 22:18:37 +0100 (CET) Received: by dev.bywatersolutions.com (Postfix, from userid 1000) id E7C7D3008A; Mon, 21 Mar 2011 17:18:36 -0400 (EDT) From: Ian Walls To: koha-patches@lists.koha-community.org Date: Mon, 21 Mar 2011 17:18:36 -0400 Message-Id: <1300742316-19575-1-git-send-email-ian.walls@bywatersolutions.com> X-Mailer: git-send-email 1.5.6.5 Cc: Jared Camins-Esakov Subject: [Koha-patches] [PATCH] Bug 5390: OPAC loses library selection X-BeenThere: koha-patches@lists.koha-community.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches submitted to Koha List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: koha-patches-bounces@lists.koha-community.org Errors-To: koha-patches-bounces@lists.koha-community.org From: Jared Camins-Esakov This patch ensures that the OPAC library selection masthead will always default to the branch that is currently being searched. This only applies to systems with multiple branches and OpacAddMastheadLibraryPulldown turned on. To test: do a search in the OPAC, limiting by branch. The search results will still have that branch selected in the masthead dropdown. This patch also fixes bug 5852 and bug 3778. Signed-off-by: Ian Walls --- C4/Auth.pm | 14 ++++++-------- koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 11 ++++++----- .../opac-tmpl/prog/en/modules/opac-advsearch.tmpl | 2 +- opac/opac-search.pl | 3 +-- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 06806ff..fecdf85 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -337,7 +337,6 @@ sub get_template_and_user { singleBranchMode => C4::Context->preference("singleBranchMode"), XSLTDetailsDisplay => C4::Context->preference("XSLTDetailsDisplay"), XSLTResultsDisplay => C4::Context->preference("XSLTResultsDisplay"), - BranchesLoop => GetBranchesLoop(), using_https => $in->{'query'}->https() ? 1 : 0, noItemTypeImages => C4::Context->preference("noItemTypeImages"), ); @@ -380,17 +379,17 @@ sub get_template_and_user { # variables passed from CGI: opac_css_override and opac_search_limits. my $opac_search_limit = $ENV{'OPAC_SEARCH_LIMIT'}; my $opac_limit_override = $ENV{'OPAC_LIMIT_OVERRIDE'}; - my $mylibraryfirst = C4::Context->preference("SearchMyLibraryFirst"); - my $opac_name; - if($opac_limit_override && ($opac_search_limit =~ /branch:(\w+)/) ){ - $opac_name = C4::Branch::GetBranchName($1) # opac_search_limit is a branch, so we use it. - } elsif($mylibraryfirst){ - $opac_name = C4::Branch::GetBranchName($mylibraryfirst); + my $opac_name = ''; + if (($opac_search_limit =~ /branch:(\w+)/ && $opac_limit_override) || $in->{'query'}->param('limit') =~ /branch:(\w+)/){ + $opac_name = $1; # opac_search_limit is a branch, so we use it. + } elsif (C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv && C4::Context->userenv->{'branch'}) { + $opac_name = C4::Context->userenv->{'branch'}; } $template->param( AmazonContent => "" . C4::Context->preference("AmazonContent"), AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"), AuthorisedValueImages => C4::Context->preference("AuthorisedValueImages"), + BranchesLoop => GetBranchesLoop($opac_name), LibraryName => "" . C4::Context->preference("LibraryName"), LibraryNameTitle => "" . $LibraryNameTitle, LoginBranchname => C4::Context->userenv?C4::Context->userenv->{"branchname"}:"", @@ -408,7 +407,6 @@ sub get_template_and_user { OpacAuthorities => C4::Context->preference("OpacAuthorities"), OPACBaseURL => ($in->{'query'}->https() ? "https://" : "http://") . $ENV{'SERVER_NAME'} . ($ENV{'SERVER_PORT'} eq ($in->{'query'}->https() ? "443" : "80") ? '' : ":$ENV{'SERVER_PORT'}"), - opac_name => $opac_name, opac_css_override => $ENV{'OPAC_CSS_OVERRIDE'}, opac_search_limit => $opac_search_limit, opac_limit_override => $opac_limit_override, diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index 6db1552..310e7b8 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -84,14 +84,15 @@ - + + + " type="hidden" /> + + " type="hidden" /> - - - - " type="hidden" /> + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl index 3a478ff..f7c2adf 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl @@ -239,7 +239,7 @@