Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge remote branch 'kc/master' into new/enh/bug_5917

Browse source
This commit is contained in:
Chris Cormack 2011-03-22 15:06:44 +13:00
commit dbf6bd4be0
4 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
C4/Auth.pm
View file

@ -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,12 +379,11 @@ 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'};
}
my $checkstyle = C4::Context->preference("opaccolorstylesheet");
if ($checkstyle =~ /http/)
@ -400,6 +398,7 @@ sub get_template_and_user {
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"}:"",
@ -417,7 +416,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,

11
koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
View file

@ -84,14 +84,15 @@
<!-- /TMPL_LOOP -->
</select>
<!-- TMPL_ELSE -->
<!-- TMPL_UNLESS NAME="opac_limit_override" -->
<!-- TMPL_IF NAME="opac_limit_override" -->
<!-- TMPL_IF NAME="opac_search_limit" -->
<input name="limit" value="<!-- TMPL_VAR name="opac_search_limit" -->" type="hidden" />
<!-- /TMPL_IF -->
<!-- TMPL_ELSE -->
<!-- TMPL_IF name="mylibraryfirst" -->
<input name="limit" value="branch:<!-- TMPL_VAR name="mylibraryfirst" -->" type="hidden" />
<!-- /TMPL_IF -->
<!-- /TMPL_UNLESS -->
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="opac_search_limit" -->
<input name="limit" value="<!-- TMPL_VAR name="opac_search_limit" -->" type="hidden" />
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

2
koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
View file

@ -239,7 +239,7 @@
<select name="limit" id="branchloop">
<option value="">All libraries</option>
<!-- TMPL_LOOP NAME="branchloop" -->
<!-- TMPL_LOOP NAME="BranchesLoop" -->
<!--TMPL_IF Name="selected"-->
<option value="branch:<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
<!--TMPL_ELSE-->

3
opac/opac-search.pl
View file

@ -140,10 +140,9 @@ if (C4::Context->preference('TagsEnabled')) {
#}
# load the branches
my $mybranch = ( C4::Context->preference('SearchMyLibraryFirst') && C4::Context->userenv && C4::Context->userenv->{branch} ) ? C4::Context->userenv->{branch} : '';
my $branches = GetBranches(); # used later in *getRecords, probably should be internalized by those functions after caching in C4::Branch is established
$template->param(
branchloop => GetBranchesLoop($mybranch, 0),
searchdomainloop => GetBranchCategories(undef,'searchdomain'),
);