Attachment 20602 Details for Bug 10588 – [PASSED QA] Bug 10588 - opac-topissues first branch always selected in filters

[patch] [PASSED QA] Bug 10588 - opac-topissues first branch always selected in filters

PASSED-QA-Bug-10588---opac-topissues-first-branch-.patch (text/plain), 4.08 KB, created by Katrin Fischer on 2013-08-25 19:04:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2013-08-25 19:04:54 UTC

Size: 4.08 KB

patch

obsolete

>From f2f8aa17ea231268cf5d95ae4eb4ef2a22c5d269 Mon Sep 17 00:00:00 2001
>From: Fridolyn SOMERS <fridolyn.somers@biblibre.com>
>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 hidden input 'do_it' 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: Srdjan <srdjan@catalyst.net.nz>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>Works nicely and passes all tests.
>---
> .../opac-tmpl/prog/en/includes/opac-topissues.inc  |    2 +-
> opac/opac-topissues.pl                             |    6 +++++-
> 2 files changed, 6 insertions(+), 2 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..55501fc 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc
>+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc
>@@ -17,7 +17,7 @@
>                 <select name="branch" id="branch" style="width: 10em;">
>                 <option value="">All libraries</option>
>                 [% FOREACH branchloo IN branchloop %]
>-                    [% IF ( branch == branchname ) %]<option value="[% branchloo.value %]" selected="selected">[% ELSE %]<option value="[% branchloo.value %]">[% END %]
>+                    [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% ELSE %]<option value="[% branchloo.value %]">[% END %]
>                         [% branchloo.branchname %]
>                     </option>
>                 [% END %]
>diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl
>index 95291d0..cdb572a 100755
>--- a/opac/opac-topissues.pl
>+++ b/opac/opac-topissues.pl
>@@ -59,10 +59,14 @@ my ($template, $borrowernumber, $cookie)
> 				});
> my $dbh = C4::Context->dbh;
> # Displaying results
>+my $do_it = $input->param('do_it') || 0; # as form been posted
> 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') || '';
>+if (!$do_it && C4::Context->userenv && C4::Context->userenv->{'branch'} ) {
>+    $branch = C4::Context->userenv->{'branch'}; # select user branch by default
>+}
> my $itemtype = $input->param('itemtype') || '';
> my $timeLimit = $input->param('timeLimit') || 3;
> my $advanced_search_types = C4::Context->preference('AdvancedSearchTypes');
>@@ -138,7 +142,7 @@ $template->param(do_it => 1,
>                 results_loop => \@results,
>                 );
> 
>-$template->param( branchloop => GetBranchesLoop(C4::Context->userenv?C4::Context->userenv->{'branch'}:''));
>+$template->param( branchloop => GetBranchesLoop($branch));
> 
> # 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

Actions: View | Diff | Splinter Review

Attachments on bug 10588: 19690 | 19714 | 19744 | 19837 | 20055 | 20103 | 20602