From 25fecf9f67b7b6a6649ab3c69839b88465db63e6 Mon Sep 17 00:00:00 2001 From: Fridolyn SOMERS Date: Mon, 27 Aug 2012 14:50:32 +0200 Subject: [PATCH] Bug 8692: Authorities search form does not correspond to current search query --- authorities/authorities-home.pl | 105 +++++++++----------- .../prog/en/includes/authorities-search.inc | 100 ++++++++++++++++++- .../prog/en/modules/authorities/detail.tt | 2 +- .../en/modules/authorities/searchresultlist.tt | 15 ++- 4 files changed, 156 insertions(+), 66 deletions(-) diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl index bc565d1..f67f5c9 100755 --- a/authorities/authorities-home.pl +++ b/authorities/authorities-home.pl @@ -21,6 +21,7 @@ use strict; use warnings; use CGI; +use URI::Escape; use C4::Auth; use C4::Context; @@ -32,13 +33,11 @@ use C4::Koha; # XXX subfield_is_koha_internal_p use C4::Biblio; my $query = new CGI; -my $op = $query->param('op'); -$op ||= q{}; -my $authtypecode = $query->param('authtypecode'); -$authtypecode ||= q{}; -my $dbh = C4::Context->dbh; +my $dbh = C4::Context->dbh; +my $op = $query->param('op') || ''; +my $authtypecode = $query->param('authtypecode') || ''; +my $authid = $query->param('authid') || ''; -my $authid = $query->param('authid'); my ( $template, $loggedinuser, $cookie ); my $authtypes = getauthtypes; @@ -71,23 +70,32 @@ if ( $op eq "delete" ) { ); &DelAuthority( $authid, 1 ); - $op = "do_search"; + if ( $query->param('operator') ) { + # query contains search params so perform search + $op = "do_search"; + } + else { + $op = ''; + } } if ( $op eq "do_search" ) { - my @marclist = $query->param('marclist'); - my @and_or = $query->param('and_or'); - my @excluding = $query->param('excluding'); - my @operator = $query->param('operator'); - my $orderby = $query->param('orderby'); - my @value = $query->param('value'); + my $marclist = $query->param('marclist') || ''; + my $and_or = $query->param('and_or') || ''; + my $excluding = $query->param('excluding') || ''; + my $operator = $query->param('operator') || ''; + my $orderby = $query->param('orderby') || ''; + my $value = $query->param('value') || ''; my $startfrom = $query->param('startfrom') || 1; my $resultsperpage = $query->param('resultsperpage') || 20; - my ( $results, $total ) = - SearchAuthorities( \@marclist, \@and_or, \@excluding, \@operator, \@value, - ( $startfrom - 1 ) * $resultsperpage, - $resultsperpage, $authtypecode, $orderby ); + my ( $results, $total ) = SearchAuthorities( + [$marclist], [$and_or], + [$excluding], [$operator], + [$value], ( $startfrom - 1 ) * $resultsperpage, + $resultsperpage, $authtypecode, + $orderby + ); ( $template, $loggedinuser, $cookie ) = get_template_and_user( { @@ -101,54 +109,34 @@ if ( $op eq "do_search" ) { ); $template->param( - marclist => $query->param('marclist'), - and_or => $query->param('and_or'), - excluding => $query->param('excluding'), - operator => $query->param('operator'), - orderby => $query->param('orderby'), - value => $query->param('value'), - authtypecode => $query->param('authtypecode'), + marclist => $marclist, + and_or => $and_or, + excluding => $excluding, + operator => $operator, + orderby => $orderby, + value => $value, + authtypecode => $authtypecode, startfrom => $startfrom, resultsperpage => $resultsperpage, ); - my @field_data = (); - # we must get parameters once again. Because if there is a mainentry, it # has been replaced by something else during the search, thus the links # next/previous would not work anymore - my @marclist_ini = $query->param('marclist'); - for ( my $i = 0 ; $i <= $#marclist ; $i++ ) { - if ( $value[$i] ) { - push @field_data, { term => "marclist", val => $marclist_ini[$i] }; - if ( !defined $and_or[$i] ) { - $and_or[$i] = q{}; - } - push @field_data, { term => "and_or", val => $and_or[$i] }; - if ( !defined $excluding[$i] ) { - $excluding[$i] = q{}; - } - push @field_data, { term => "excluding", val => $excluding[$i] }; - push @field_data, { term => "operator", val => $operator[$i] }; - push @field_data, { term => "value", val => $value[$i] }; - } - } # construction of the url of each page - my $base_url = - 'authorities-home.pl?' - . join( '&', map { $_->{term} . '=' . $_->{val} } @field_data ) - . '&' - . join( - '&', - map { $_->{term} . '=' . $_->{val} } ( - { term => 'resultsperpage', val => $resultsperpage }, - { term => 'type', val => 'intranet' }, - { term => 'op', val => 'do_search' }, - { term => 'authtypecode', val => $authtypecode }, - { term => 'orderby', val => $orderby }, - ) - ); + my $value_url = uri_escape($value); + my $base_url = "authorities-home.pl?" + ."marclist=$marclist" + ."&and_or=$and_or" + ."&excluding=$excluding" + ."&operator=$operator" + ."&value=$value_url" + ."&resultsperpage=$resultsperpage" + ."&type=intranet" + ."&op=do_search" + ."&authtypecode=$authtypecode" + ."&orderby=$orderby"; my $from = ( $startfrom - 1 ) * $resultsperpage + 1; my $to; @@ -191,7 +179,10 @@ if ( $op eq '' ) { } -$template->param( authtypesloop => \@authtypesloop, ); +$template->param( + authtypesloop => \@authtypesloop, + op => $op, +); $template->{VARS}->{marcflavour} = C4::Context->preference("marcflavour"); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc index ca6f4af..edccf10 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc @@ -1,6 +1,22 @@

[% LibraryName %]

+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt index e21f846..b10c413 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt @@ -18,7 +18,7 @@ function confirm_deletion() { var is_confirmed = confirm('Are you sure you want to delete this authority?'); if (is_confirmed) { - window.location="authorities-home.pl?op=delete&authid=[% authid %]"; + window.location="authorities-home.pl?op=delete&authid=[% authid %]"; } } function Dopop(link) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt index 6ac139a..5617dc9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt @@ -8,9 +8,18 @@ function confirm_deletion(id) { var is_confirmed = confirm('Are you sure you want to delete this authority?'); if (is_confirmed) { - window.location="authorities-home.pl?op=delete&authid=" - + id - + "&marclist=[% marclist %]&and_or=[% and_or %]&excluding=[% excluding %]&operator=[%operator%]&orderby=[% orderby %]&value=[% value %]&startfrom=[% startfrom %]&resultsperpage=[% resultsperpage %]"; + window.location="authorities-home.pl?op=delete" + + "&authid=" + id + + "&type=intranet" + + "&authtypecode=[% authtypecode %]" + + "&marclist=[% marclist %]" + + "&and_or=[% and_or %]" + + "&excluding=[% excluding %]" + + "&operator=[% operator %]" + + "&orderby=[% orderby %]" + + "&value=[% value |url %]" + + "&startfrom=[% startfrom %]" + + "&resultsperpage=[% resultsperpage %]"; } } function Help() { -- 1.7.9.5