Bugzilla – Attachment 8295 Details for
Bug 7169
Change booksellers search results display
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Follow-up: Change booksellers search results display
0002-Bug-7169-Follow-up-Change-booksellers-search-results.patch (text/plain), 4.98 KB, created by
Julian Maurice
on 2012-03-19 15:08:51 UTC
(
hide
)
Description:
Follow-up: Change booksellers search results display
Filename:
MIME Type:
Creator:
Julian Maurice
Created:
2012-03-19 15:08:51 UTC
Size:
4.98 KB
patch
obsolete
>From da6d38d878eefc77ac5504a0d432d84bef401502 Mon Sep 17 00:00:00 2001 >From: Julian Maurice <julian.maurice@biblibre.com> >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; >+ }); > }); > //]]> > </script> >@@ -49,11 +53,13 @@ $(document).ready(function() { > [% END %] > [% IF ( loop_suppliers.size ) %] > [% UNLESS (count == 1) %] >- <ul class="suppliers_anchors"> >+ <p>Choose a vendor in the list to jump directly to the right place. >+ <select id="supplierlist"> > [% FOREACH supplier IN loop_suppliers %] >- <li><a href="#[% supplier.booksellerid %]">[% supplier.name %]</a></li> >+ <option value="[% supplier.booksellerid %]">[% supplier.name %]</option> > [% END %] >- </ul> >+ </select> >+ </p> > [% END %] > <div id="acqui_order_supplierlist"> > [% FOREACH supplier IN loop_suppliers %] >@@ -68,7 +74,7 @@ $(document).ready(function() { > <span class="action"> > [% IF ( CAN_user_acquisition_order_manage ) %] > [% IF ( supplier.active ) %] >- <input type="button" value="New basket" onclick="window.location.href='/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid %]&op=add_form'" /> >+ <input type="button" value="New basket" onclick="window.location.href='/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid %]&op=add_form'" /> > [% ELSE %] > (inactive) > [% END %] >@@ -81,9 +87,9 @@ $(document).ready(function() { > <thead> > <tr> > <th>Basket (#)</th> >- <th>Biblios</th> >- <th>Items</th> >- <th>Expected items</th> >+ <th>Item count</th> >+ <th>Biblio count</th> >+ <th>Items expected</th> > <th>Created by</th> > <th>Date</th> > <th> </th> >@@ -97,8 +103,8 @@ $(document).ready(function() { > <tr> > [% END %] > <td>[% basket.basketname %] (#[% basket.basketno %])</td> >- <td>[% basket.total_biblios %]</td> > <td>[% basket.total_items %]</td> >+ <td>[% basket.total_biblios %]</td> > <td>[% basket.expected_items %]</td> > <td> > [% basket.authorisedby_firstname %] >-- >1.7.9.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7169
:
6231
|
7134
|
7858
|
7885
|
7886
|
7956
|
8294
| 8295