From 4a8b4d1949f0dac1f3c3251741d68b9a4a862695 Mon Sep 17 00:00:00 2001 From: Fridolyn SOMERS Date: Mon, 15 Jul 2013 12:14:53 +0200 Subject: [PATCH] [PASSED QA] Bug 10588 - opac-topissues first branch always selected in filters In OPAC most popular items page: With user is logged-in his branch should be selected. When a branch is manually selected and form is submitted, this branch should be selected in results page. When looking at HTML, you see that all options are selected in combobox. This patch corrects by using the code "__ANY__" to distinguish form display and no branch filter selected. Test plan : - Make sure there are issues on records created in the past 3 month - Go to OPAC not logged-in - Click on "Most popular" => You get to page with results, "All libraries" is selected - Select a branch and submit => You get to page with results, the branch is selected [testing opac-topissues.inc from] - Select a branch and perform a search that does not have results (for example an item type never issued) => You get to page without results, the branch is selected [testing opac-topissues.tt form] - Log-in with a user - Click on "Most popular" => You get to page with results, user's branch is selected - Select "All libraries" and submit => You get to page with results, "All libraries" is selected [testing opac-topissues.inc from] - Select "All libraries" and perform a search that does not have results (for example an item type never issued) => You get to page without results, "All libraries" is selected [testing opac-topissues.tt form] Signed-off-by: Liz Rea Tests work as described - much improved! Signed-off-by: Katrin Fischer I am not sure about the use of "__ANY__" but the behaviour of the page is improved by the patch. --- .../opac-tmpl/prog/en/includes/opac-topissues.inc | 4 ++-- .../opac-tmpl/prog/en/modules/opac-topissues.tt | 2 +- opac/opac-topissues.pl | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc index 20b1d9b..05ff89d 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc @@ -15,9 +15,9 @@
  • - + [% FOREACH branchloo IN branchloop %] [% IF ( branchloo.selected ) %] diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl index 95291d0..8a9eb75 100755 --- a/opac/opac-topissues.pl +++ b/opac/opac-topissues.pl @@ -62,7 +62,8 @@ my $dbh = C4::Context->dbh; my $limit = $input->param('limit'); $limit = 10 unless ($limit && $limit =~ /^\d+$/); # control user input for SQL query $limit = 100 if $limit > 100; -my $branch = $input->param('branch') || ''; +my $branch_input = $input->param('branch') || ''; +my $branch = $branch_input eq '__ANY__' ? '' : $branch_input ; # __ANY__ is used to distinguish form display and no branch filter selected my $itemtype = $input->param('itemtype') || ''; my $timeLimit = $input->param('timeLimit') || 3; my $advanced_search_types = C4::Context->preference('AdvancedSearchTypes'); @@ -138,7 +139,9 @@ $template->param(do_it => 1, results_loop => \@results, ); -$template->param( branchloop => GetBranchesLoop(C4::Context->userenv?C4::Context->userenv->{'branch'}:'')); +# GetBranchesLoop without parameter will select user default branch +my $branchloop = $branch_input ? GetBranchesLoop($branch_input) : GetBranchesLoop(); +$template->param( branchloop => $branchloop ); # the index parameter is different for item-level itemtypes my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype'; -- 1.7.9.5