From da6d38d878eefc77ac5504a0d432d84bef401502 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Thu, 1 Mar 2012 09:46:49 +0100 Subject: [PATCH 2/2] Bug 7169: Follow-up: Change booksellers search results display - List of booksellers changed to a drop-down list - Baskets columns renamed and reordered to make them consistent with acqui/parcels.pl - warning in log removed - changed a '&' to '&' to pass W3 validator --- acqui/booksellers.pl | 4 +- .../prog/en/modules/acqui/booksellers.tt | 22 ++++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl index f1fa9f3..025fbd1 100755 --- a/acqui/booksellers.pl +++ b/acqui/booksellers.pl @@ -121,8 +121,8 @@ for my $vendor (@suppliers) { if ($userenv->{'flags'} & 1 || #user is superlibrarian (haspermission( $uid, { acquisition => q{*} } ) && #user has acq permissions and ($viewbaskets eq 'all' || #user is allowed to see all baskets - ($viewbaskets eq 'branch' && $authorisedby && $userbranch eq GetMember( borrowernumber => $authorisedby )->{branchcode}) || #basket belongs to user's branch - ($basket->{authorisedby} && $viewbaskets == 'user' && $authorisedby == $loggedinuser) #user created this basket + ($viewbaskets eq 'branch' && $authorisedby && $userbranch eq $basketbranch) || #basket belongs to user's branch + ($basket->{authorisedby} && $viewbaskets eq 'user' && $authorisedby == $loggedinuser) #user created this basket ) ) ) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 26c15fc..0e6aaa3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -24,6 +24,10 @@ $(document).ready(function() { { 'aTargets': [-1], 'bSortable': false } ] })); + $("#supplierlist").change(function() { + var id = $(this).find("option:selected").val(); + window.location.href = "#" + id; + }); }); //]]> @@ -49,11 +53,13 @@ $(document).ready(function() { [% END %] [% IF ( loop_suppliers.size ) %] [% UNLESS (count == 1) %] -