From 4a20936f8df5a2d398302af3e9f53ae88bb880bc Mon Sep 17 00:00:00 2001 From: Fridolin Somers <fridolin.somers@biblibre.com> Date: Tue, 4 Oct 2016 12:36:11 +0200 Subject: [PATCH] [PASSED QA] Bug 17394 - exporting checkouts with items selects without items in combo-box In checkouts table, the is an export form (when some exports syspref are enabled). When selecting some checkouts and selecting "ISO2709 with items" in export format combo-box, clicking on "Export" will select "ISO2709 without items" in the export format combo-box. This is quite strange. Its because the form as 2 inputs with same name and id "output_format" : an hidden input (the wanted arg for tools/export.pl) and a select (the export format combo-box). So an action meant on the hidden input impacts the select. This patch corrects by changing id and name of the export format combo-box : issues-table-output-format TEST plan : - Enable checkouts exports by setting syspref ExportWithCsvProfile with a profile - Go to circ page of a patron with checkouts : /cgi-bin/koha/circ/circulation.pl?borrowernumber=xxx - Show checkouts table - Select some checkboxes in "Export" column - Select "ISO2709 with items" in export format combo-box - Click on "Export" => Without patch, the export format combo-box changes to "ISO2709 without items" => With patch, the export format combo-box does not changes - Check the export file contains the items - Check exports "ISO2709 without items" and "CSV" are OK Signed-off-by: Jesse Maseto <jesse@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> --- koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc index 78d3989..0454c6c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -51,8 +51,8 @@ [% IF ( exports_enabled ) %] <fieldset> - <label for="output_format"><b>Export checkouts using format:</b></label> - <select name="output_format" id="output_format"> + <label for="issues-table-output-format"><b>Export checkouts using format:</b></label> + <select name="issues-table-output-format" id="issues-table-output-format"> <option value="iso2709_995">ISO2709 with items</option> <option value="iso2709">ISO2709 without items</option> [% IF Koha.Preference('ExportWithCsvProfile') %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js b/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js index c6525ff..4683b5d 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js +++ b/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js @@ -50,8 +50,7 @@ $(document).ready(function() { if ( ! is_valid_date( $(this).val() ) ) {$(this).val("");} }); $("#export_submit").on("click",function(){ - var output_format = $("#output_format").val(); - export_checkouts(output_format); + export_checkouts($("#issues-table-output-format").val()); return false; }); -- 2.1.4