From 3a7488f8749f7aae4d91b49134077781cc02b5d0 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 20 Nov 2012 12:27:25 -0500 Subject: [PATCH] Bug 9073 - Download option from the cart should match the menu button in lists This patch moves the staff client Cart download choices into a toolbar menu button instead of requiring that the user make the choice via a form in the pop-up window. To test, add items to Cart in the staff client. Open the cart and choose a download option from the Download menu. Your download should complete correctly without the page changing or reloading. Unrelated edit: Eliminating duplicate document.ready() block by consolidating a couple of lines of JavaScript. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Checked all export formats can be selected and downloaded, including CSV profiles. All tests and perlcritic pass. Signed-off-by: Jared Camins-Esakov --- basket/basket.pl | 3 ++ .../prog/en/modules/basket/basket.tt | 40 ++++++++++++------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/basket/basket.pl b/basket/basket.pl index 8fc15e4b73..d33216cb19 100755 --- a/basket/basket.pl +++ b/basket/basket.pl @@ -24,6 +24,7 @@ use C4::Biblio; use C4::Items; use C4::Auth; use C4::Output; +use C4::Csv; my $query = new CGI; @@ -120,6 +121,8 @@ my $resultsarray = \@results; $template->param( BIBLIO_RESULTS => $resultsarray, + csv_profiles => GetCsvProfilesLoop(), + bib_list => $bib_list, ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt index 2fd88322b8..99891944cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -14,15 +14,6 @@ [% END %] @@ -98,11 +110,9 @@ function placeHold () { Send -
  • - - Download - -
  • +
  • + Download +
  • Print -- 2.39.5