From f3197e20eb733c45e0be5656c3a759e9ade7c705 Mon Sep 17 00:00:00 2001
From: Julian Maurice
Date: Thu, 1 Mar 2012 09:46:49 +0100
Subject: [PATCH] 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
Signed-off-by: Paul Poulain
---
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 f1fa9f314d..025fbd1fb7 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 26c15fcaa8..0e6aaa34bf 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) %]
-
+ Choose a vendor in the list to jump directly to the right place.
+
+
+
[% END %]
[% FOREACH supplier IN loop_suppliers %]
@@ -68,7 +74,7 @@ $(document).ready(function() {
[% IF ( CAN_user_acquisition_order_manage ) %]
[% IF ( supplier.active ) %]
-
+
[% ELSE %]
(inactive)
[% END %]
@@ -81,9 +87,9 @@ $(document).ready(function() {
Basket (#) |
- Biblios |
- Items |
- Expected items |
+ Item count |
+ Biblio count |
+ Items expected |
Created by |
Date |
|
@@ -97,8 +103,8 @@ $(document).ready(function() {
[% END %]
[% basket.basketname %] (#[% basket.basketno %]) |
- [% basket.total_biblios %] |
[% basket.total_items %] |
+ [% basket.total_biblios %] |
[% basket.expected_items %] |
[% basket.authorisedby_firstname %]
--
2.39.2
|