From 25688f6eae3f05c23558f4a8b951543f62195421 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 18 Oct 2012 15:34:23 -0400 Subject: [PATCH] Bug 8913 [Follow-up] Improve acquisitions navigation Content-Type: text/plain; charset="utf-8" This follow up adds the vendor menu and toolbar to booksellers.pl when there is only one "search result" (i.e. a vendor id is passed). - Menu appears when booksellerid variable is present - Redundant heading removed - Additional variables added to enable proper display of the toolbar Signed-off-by: Kyle M Hall --- acqui/booksellers.pl | 3 ++- .../prog/en/modules/acqui/booksellers.tt | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl index 5a1c248..1c66ba0 100755 --- a/acqui/booksellers.pl +++ b/acqui/booksellers.pl @@ -87,7 +87,8 @@ my $supplier_count = @suppliers; if ( $supplier_count == 1 ) { $template->param( supplier_name => $suppliers[0]->{'name'}, - booksellerid => $suppliers[0]->{'booksellerid'} + booksellerid => $suppliers[0]->{'id'}, + basketcount => $suppliers[0]->{'basketcount'} ); } 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 4077b5d..b0e4549 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -47,9 +47,7 @@ $(document).ready(function() {
[% INCLUDE 'acquisitions-toolbar.inc' %] -[% IF ( count == 1 ) %] -

[% supplier_name %]

-[% ELSE %] +[% UNLESS ( count == 1 ) %]

You searched on vendor [% supplier %], [% count %] results found

[% END %] [% IF ( loop_suppliers.size ) %] @@ -139,6 +137,9 @@ $(document).ready(function() {
+[% IF ( booksellerid ) %] +[% INCLUDE 'vendor-menu.inc' %] +[% END %] [% INCLUDE 'acquisitions-menu.inc' %]
-- 1.7.2.5