[Koha-patches] [PATCH] Bug 4103 - In Pro Adv Search, superlibrarian search always all libraries
Frédéric Demians
f.demians at tamil.fr
Wed Feb 3 21:40:53 CET 2010
---
catalogue/search.pl | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/catalogue/search.pl b/catalogue/search.pl
index adb3cc7..bdcdfa8 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -205,16 +205,20 @@ if (C4::Context->preference("marcflavour") eq "UNIMARC" ) {
# load the branches
my $branches = GetBranches();
-my @branch_loop;
-# we need to know the borrower branch code to set a default branch
-my $borrowerbranchcode = C4::Context->userenv->{'branch'};
-
-for my $branch_hash (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
- # if independantbranches is activated, set the default branch to the borrower branch
- my $selected = (C4::Context->preference("independantbranches") and ($borrowerbranchcode eq $branch_hash)) ? 1 : undef;
- push @branch_loop, {value => "$branch_hash" , branchname => $branches->{$branch_hash}->{'branchname'}, selected => $selected};
-}
+# Populate branch_loop with all branches sorted by their name. If
+# independantbranches is activated, set the default branch to the borrower
+# branch, except for superlibrarian who need to search all libraries.
+my $user = C4::Context->userenv;
+my @branch_loop = map {
+ {
+ value => $_,
+ branchname => $branches->{$_}->{branchname},
+ selected => $user->{branch} eq $_ && C4::Branch::onlymine(),
+ }
+} sort {
+ $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname}
+} keys %$branches;
my $categories = GetBranchCategories(undef,'searchdomain');
--
1.6.4.3
More information about the Koha-patches
mailing list