From 8c1b95feee01fb6b224f0d86d9efec5a3efebe0c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 24 Apr 2015 10:02:19 +0200 Subject: [PATCH] [Signed-off] Bug 11880: Select what has been selected before MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous patch wants to select the barcode option when the user is on the item search for label, in all cases. So even if 'title' is selected, a search done, and there is no result, the barcode index is selected anyway. In this case, the title option should be kept. Test plan: Confirm that the barcode option is the default choice, but other values are kept if the search does not return any result. Followed test plan, behaves as expected. Tested with all choices. Signed-off-by: Marc VĂ©ron --- .../intranet-tmpl/prog/en/modules/labels/search.tt | 30 ++++++++++---------- labels/label-item-search.pl | 3 +- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt index af95538..d9d5235 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt @@ -23,45 +23,45 @@ to add to Batch [% batch_id %]
  1. diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl index 2202c93..f28f057 100755 --- a/labels/label-item-search.pl +++ b/labels/label-item-search.pl @@ -225,7 +225,6 @@ if ($show_results) { result_set=> \@results_set, batch_id => $batch_id, type => $type, - idx => $idx, ccl_query => $ccl_query, ); } @@ -262,5 +261,7 @@ else { } +$template->param( idx => $idx ); + # Print the page output_html_with_http_headers $query, $cookie, $template->output; -- 1.7.10.4